Author: mdf
Date: Fri Oct 8 18:06:15 2010
New Revision: 213588
URL: http://svn.freebsd.org/changeset/base/213588
Log:
MFC r212926:
Use destroy_dev_sched(9) instead of destroy_dev(9) in passcleanup() as
it is indirectly a d_close method.
Modified:
stable/8/sys/cam/scsi/scsi_pass.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/cam/scsi/scsi_pass.c
==============================================================================
--- stable/8/sys/cam/scsi/scsi_pass.c Fri Oct 8 17:58:07 2010
(r213587)
+++ stable/8/sys/cam/scsi/scsi_pass.c Fri Oct 8 18:06:15 2010
(r213588)
@@ -169,7 +169,11 @@ passcleanup(struct cam_periph *periph)
xpt_print(periph->path, "removing device entry\n");
devstat_remove_entry(softc->device_stats);
cam_periph_unlock(periph);
- destroy_dev(softc->dev);
+ /*
+ * passcleanup() is indirectly a d_close method via passclose,
+ * so using destroy_dev(9) directly can result in deadlock.
+ */
+ destroy_dev_sched(softc->dev);
cam_periph_lock(periph);
free(softc, M_DEVBUF);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
