Revert "[SCSI] fix usb storage oops"
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 2 Dec 2005 23:54:37 +0000 (15:54 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 2 Dec 2005 23:54:37 +0000 (15:54 -0800)
This reverts commit 34ea80ec6a02ad02e6b9c75c478c18e5880d6713.

It does a put_device() from softirq context, which is bad since it gets
a semaphore for reading.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/scsi/scsi_lib.c

index ce9d73a292e2a0f273992efd56e7cb7370f2bbc0..4afef5cdcb17568c1380d3987d1e4c4661dc16e4 100644 (file)
@@ -542,17 +542,10 @@ static void scsi_requeue_command(struct request_queue *q, struct scsi_cmnd *cmd)
 
 void scsi_next_command(struct scsi_cmnd *cmd)
 {
-       struct scsi_device *sdev = cmd->device;
-       struct request_queue *q = sdev->request_queue;
-
-       /* need to hold a reference on the device before we let go of the cmd */
-       get_device(&sdev->sdev_gendev);
+       struct request_queue *q = cmd->device->request_queue;
 
        scsi_put_command(cmd);
        scsi_run_queue(q);
-
-       /* ok to remove device now */
-       put_device(&sdev->sdev_gendev);
 }
 
 void scsi_run_host_queues(struct Scsi_Host *shost)