A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-30 03:27:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "scsi: Fix a bdi reregistration race"

Browse source 
The SCSI sd driver probes SCSI devices asynchronously. The sd_remove()
function, called indirectly by device_del(), waits until asynchronous
probing has finished. Since the block layer queue must only be cleaned
up after probing has finished, device_del() has to be called before
blk_cleanup_queue(). Hence revert commit bf2cf3baa2.

Signed-off-by: Bart Van Assche <[email protected]>
Cc: <[email protected]>
Signed-off-by: James Bottomley <[email protected]>
This commit is contained in:
Bart Van Assche 2015-11-20 14:11:01 -08:00 • committed by James Bottomley
commit e619e6cbec
1 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
drivers/scsi/scsi_sysfs.c
View file

@ -1110,7 +1110,9 @@ void __scsi_remove_device(struct scsi_device *sdev)
device_unregister(&sdev->sdev_dev);
transport_remove_device(dev);
scsi_dh_remove_device(sdev);
}
device_del(dev);
} else
put_device(&sdev->sdev_dev);
/*
* Stop accepting new requests and wait until all queuecommand() and
@ -1121,16 +1123,6 @@ void __scsi_remove_device(struct scsi_device *sdev)
blk_cleanup_queue(sdev->request_queue);
cancel_work_sync(&sdev->requeue_work);
/*
* Remove the device after blk_cleanup_queue() has been called such
* a possible bdi_register() call with the same name occurs after
* blk_cleanup_queue() has called bdi_destroy().
*/
if (sdev->is_visible)
device_del(dev);
else
put_device(&sdev->sdev_dev);
if (sdev->host->hostt->slave_destroy)
sdev->host->hostt->slave_destroy(sdev);
transport_destroy_device(dev);