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.
This commit is contained in:
Justin T. Gibbs 2011-06-26 01:32:46 +00:00
parent 5245d98d0f
commit c41ba40947
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=223557

View file

@ -687,6 +687,10 @@ cdregister(struct cam_periph *periph, void *arg)
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, void *arg)
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, void *arg)
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