Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0feed274 authored by James Bottomley's avatar James Bottomley
Browse files

Revert "[SCSI] fix bsg queue oops with iscsi logout" 



This reverts commit 4b6f5b3a.

bsg takes a reference to the underlying generic device, so it's
impossible to unregister bsg in the device release routine.

Acked-by: default avatarFUJITA Tomonori <tomof@acm.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 05dda977

drivers/scsi/scsi_sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -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);