projects/linux·commit e5e06985

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

e5e06985 · Linus Torvalds <[email protected]> · 2011-05-06 10:01:54 -07:00

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] fix oops in scsi_run_queue()
Commit
e5e06985bec89414ce2b3f301c24d884f609b020
Parents
fa039d5f · c055f5b2

Merge commit. Changes below are compared with the first parent: fa039d5f.

Changes

1 files changed · +6 −1

FileStatusAddDelContent
drivers/scsi/scsi_lib.cmodified+6−1View file

drivers/scsi/scsi_lib.c

View file
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index e9901b8..0bac91e 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -400,10 +400,15 @@ 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 = sdev->host;
+ struct Scsi_Host *shost;
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);