[SCSI] fix bsg queue oops with iscsi logout
authorMike Christie <michaelc@cs.wisc.edu>
Tue, 11 Mar 2008 05:36:51 +0000 (00:36 -0500)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Thu, 13 Mar 2008 21:47:05 +0000 (16:47 -0500)
Delay bsg unregistration, because we want to wait until all the request/cmds
have released their reference.

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Acked-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
drivers/scsi/scsi_sysfs.c

index ed83cdb6e67dfbdb5c829238c91ed861b124a426..b9b09a70458435dcc34544555e759cb6b8a0e300 100644 (file)
@@ -294,6 +294,7 @@ 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);
@@ -857,7 +858,6 @@ 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);