tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Revert "[SCSI] fix usb storage oops"

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>

Linus Torvalds 1b0997f5 2741049e

+1 -8
unified split
+1 -8
drivers/scsi/scsi_lib.c
··· 542 543 void scsi_next_command(struct scsi_cmnd *cmd) 544 { 545 - struct scsi_device *sdev = cmd->device; 546 - struct request_queue *q = sdev->request_queue; 547 - 548 - /* need to hold a reference on the device before we let go of the cmd */ 549 - get_device(&sdev->sdev_gendev); 550 551 scsi_put_command(cmd); 552 scsi_run_queue(q); 553 - 554 - /* ok to remove device now */ 555 - put_device(&sdev->sdev_gendev); 556 } 557 558 void scsi_run_host_queues(struct Scsi_Host *shost)
··· 542 543 void scsi_next_command(struct scsi_cmnd *cmd) 544 { 545 + struct request_queue *q = cmd->device->request_queue; 546 547 scsi_put_command(cmd); 548 scsi_run_queue(q); 549 } 550 551 void scsi_run_host_queues(struct Scsi_Host *shost)