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

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

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

Linus Torvalds e5e06985 fa039d5f

+6 -1
unified split
+6 -1
drivers/scsi/scsi_lib.c
··· 400 static void scsi_run_queue(struct request_queue *q) 401 { 402 struct scsi_device *sdev = q->queuedata; 403 - struct Scsi_Host *shost = sdev->host; 404 LIST_HEAD(starved_list); 405 unsigned long flags; 406 407 if (scsi_target(sdev)->single_lun) 408 scsi_single_lun_run(sdev); 409
··· 400 static void scsi_run_queue(struct request_queue *q) 401 { 402 struct scsi_device *sdev = q->queuedata; 403 + struct Scsi_Host *shost; 404 LIST_HEAD(starved_list); 405 unsigned long flags; 406 407 + /* if the device is dead, sdev will be NULL, so no queue to run */ 408 + if (!sdev) 409 + return; 410 + 411 + shost = sdev->host; 412 if (scsi_target(sdev)->single_lun) 413 scsi_single_lun_run(sdev); 414