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

torvalds · torvalds · commit 23c79d31a3dd · 2011-06-04T23:19:51.000+09:00
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] Fix oops caused by queue refcounting failure
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
@@ -297,7 +297,7 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,
 		kfree(sdev);
 		goto out;
 	}
-
+	blk_get_queue(sdev->request_queue);
 	sdev->request_queue->queuedata = sdev;
 	scsi_adjust_queue_depth(sdev, 0, sdev->host->cmd_per_lun);
 
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
@@ -322,6 +322,7 @@ static void scsi_device_dev_release_usercontext(struct work_struct *work)
 		kfree(evt);
 	}
 
+	blk_put_queue(sdev->request_queue);
 	/* NULL queue means the device can't be used */
 	sdev->request_queue = NULL;
 

Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ static struct scsi_device scsi_alloc_sdev(struct scsi_target starget,`
`297`	`297`	`kfree(sdev);`
`298`	`298`	`goto out;`
`299`	`299`	`}`
`300`		`-`
	`300`	`+ blk_get_queue(sdev->request_queue);`
`301`	`301`	`sdev->request_queue->queuedata = sdev;`
`302`	`302`	`scsi_adjust_queue_depth(sdev, 0, sdev->host->cmd_per_lun);`
`303`	`303`
Original file line number	Diff line number	Diff line change
`@@ -322,6 +322,7 @@ static void scsi_device_dev_release_usercontext(struct work_struct *work)`
`322`	`322`	`kfree(evt);`
`323`	`323`	`}`
`324`	`324`
	`325`	`+ blk_put_queue(sdev->request_queue);`
`325`	`326`	`/* NULL queue means the device can't be used */`
`326`	`327`	`sdev->request_queue = NULL;`
`327`	`328`