提交 1b0997f5 编写于 作者: L Linus Torvalds

Revert "[SCSI] fix usb storage oops"

This reverts commit 34ea80ec.

It does a put_device() from softirq context, which is bad since it gets
a semaphore for reading.
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 2741049e
...@@ -542,17 +542,10 @@ static void scsi_requeue_command(struct request_queue *q, struct scsi_cmnd *cmd) ...@@ -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) void scsi_next_command(struct scsi_cmnd *cmd)
{ {
struct scsi_device *sdev = cmd->device; struct request_queue *q = cmd->device->request_queue;
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% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册