svn commit: r223557 - head/sys/cam/scsi

[Justin T. Gibbs]

Author: gibbs
Date: Sun Jun 26 01:32:46 2011
New Revision: 223557
URL: http://svn.freebsd.org/changeset/base/223557

Log:
  cam/scsi/scsi_cd.c:
  	In cdregister(), hold the periph lock semaphore during changer
  	probe/configuration.  This removes a window where an open of the
  	cd device may succeed before probe processing has completed.

Modified:
  head/sys/cam/scsi/scsi_cd.c

Modified: head/sys/cam/scsi/scsi_cd.c
==============================================================================
--- head/sys/cam/scsi/scsi_cd.c	Sun Jun 26 01:14:54 2011	(r223556)
+++ head/sys/cam/scsi/scsi_cd.c	Sun Jun 26 01:32:46 2011	(r223557)
@@ -687,6 +687,10 @@ cdregister(struct cam_periph *periph, vo
 	else
 		softc->minimum_command_size = 6;
 
+	/*
+	 * Refcount and block open attempts until we are setup
+	 * Can't block
+	 */
 	(void)cam_periph_hold(periph, PRIBIO);
 	cam_periph_unlock(periph);
 	/*
@@ -747,7 +751,6 @@ cdregister(struct cam_periph *periph, vo
 	softc->disk->d_hba_subdevice = cpi.hba_subdevice;
 	disk_create(softc->disk, DISK_VERSION);
 	cam_periph_lock(periph);
-	cam_periph_unhold(periph);
 
 	/*
 	 * Add an async callback so that we get
@@ -972,12 +975,6 @@ cdregister(struct cam_periph *periph, vo
 
 cdregisterexit:
 
-	/*
-	 * Refcount and block open attempts until we are setup
-	 * Can't block
-	 */
-	(void)cam_periph_hold(periph, PRIBIO);
-
 	if ((softc->flags & CD_FLAG_CHANGER) == 0)
 		xpt_schedule(periph, CAM_PRIORITY_DEV);
 	else