Commit 49d7bc64 authored by Linus Torvalds's avatar Linus Torvalds

Revert revert of "[SCSI] fix usb storage oops"

This reverts commit 1b0997f5, which in
turn reverted 34ea80ec (which is thus
re-instated).

Quoth James Bottomley:

  "All it's doing is deferring the device_put() from the
   scsi_put_command() to after the scsi_run_queue(), which doesn't fix
   the sleep while atomic problem of the device release method.  In both
   cases we still get the semaphore in atomic context problem which is
   caused by scsi_reap_target() doing a device_del(), which I assumed
   (wrongly) was valid from atomic context."

who also promised to fix scsi_reap_target().
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5036805b
...@@ -542,10 +542,17 @@ static void scsi_requeue_command(struct request_queue *q, struct scsi_cmnd *cmd) ...@@ -542,10 +542,17 @@ static void scsi_requeue_command(struct request_queue *q, struct scsi_cmnd *cmd)
void scsi_next_command(struct scsi_cmnd *cmd) void scsi_next_command(struct scsi_cmnd *cmd)
{ {
struct request_queue *q = cmd->device->request_queue; 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);
scsi_put_command(cmd); scsi_put_command(cmd);
scsi_run_queue(q); scsi_run_queue(q);
/* ok to remove device now */
put_device(&sdev->sdev_gendev);
} }
void scsi_run_host_queues(struct Scsi_Host *shost) void scsi_run_host_queues(struct Scsi_Host *shost)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment