projects
/
linux-flexiantxendom0-natty.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
bdccb81
)
Revert "fix oops in scsi_run_queue()"
author
Steve Conklin <sconklin@canonical.com>
Tue, 28 Jun 2011 13:33:14 +0000
(14:33 +0100)
committer
Steve Conklin <sconklin@canonical.com>
Tue, 28 Jun 2011 13:33:14 +0000
(14:33 +0100)
This reverts commit
57bd324dbd799b271cad945224df5a21b151297b
.
This revert is being tracked in bug 802986
drivers/scsi/scsi_lib.c
patch
|
blob
|
history
diff --git
a/drivers/scsi/scsi_lib.c
b/drivers/scsi/scsi_lib.c
index
415fdf2
..
fb2bb35
100644
(file)
--- a/
drivers/scsi/scsi_lib.c
+++ b/
drivers/scsi/scsi_lib.c
@@
-400,15
+400,10
@@
static inline int scsi_host_is_busy(struct Scsi_Host *shost)
static void scsi_run_queue(struct request_queue *q)
{
struct scsi_device *sdev = q->queuedata;
- struct Scsi_Host *shost;
+ struct Scsi_Host *shost = sdev->host;
LIST_HEAD(starved_list);
unsigned long flags;
- /* if the device is dead, sdev will be NULL, so no queue to run */
- if (!sdev)
- return;
-
- shost = sdev->host;
if (scsi_target(sdev)->single_lun)
scsi_single_lun_run(sdev);