diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-03-26 09:09:19 -0700 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-03-26 09:09:19 -0700 |
| commit | 0feed274d2dfa2162d2c37c254eede96926d3717 (patch) | |
| tree | cf1f373d5f8ec8becfa29b47e455652d5c20f1eb | |
| parent | 05dda977f2574c3341abef9b74c27d2b362e1e3a (diff) | |
| download | linux-0feed274d2dfa2162d2c37c254eede96926d3717.tar.bz2 | |
Revert "[SCSI] fix bsg queue oops with iscsi logout"
This reverts commit 4b6f5b3a993cbe34b4280f252bccc76967c185c8.
bsg takes a reference to the underlying generic device, so it's
impossible to unregister bsg in the device release routine.
Acked-by: FUJITA Tomonori <tomof@acm.org>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
| -rw-r--r-- | drivers/scsi/scsi_sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index b9b09a704584..ed83cdb6e67d 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c @@ -294,7 +294,6 @@ static void scsi_device_dev_release_usercontext(struct work_struct *work) } if (sdev->request_queue) { - bsg_unregister_queue(sdev->request_queue); sdev->request_queue->queuedata = NULL; /* user context needed to free queue */ scsi_free_queue(sdev->request_queue); @@ -858,6 +857,7 @@ void __scsi_remove_device(struct scsi_device *sdev) if (scsi_device_set_state(sdev, SDEV_CANCEL) != 0) return; + bsg_unregister_queue(sdev->request_queue); class_device_unregister(&sdev->sdev_classdev); transport_remove_device(dev); device_del(dev); |