summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
author <jejb@titanic.il.steeleye.com>2005-04-12 23:38:09 +0200
committerJames Bottomley <jejb@titanic>2005-04-17 03:10:34 +0200
commitc2a9331c62216e222a08de8dd58559367fef0af6 (patch)
treef25b06ee61ffa8b000a45d0ec5f8a92ebb67f0ce /drivers/scsi
parent[PATCH] fix NMI lockup with CFQ scheduler (diff)
downloadlinux-c2a9331c62216e222a08de8dd58559367fef0af6.tar.xz
linux-c2a9331c62216e222a08de8dd58559367fef0af6.zip
updates for CFQ oops fix
- add a comment to the device structure that the device_busy field is now protected by the request_queue->queue_lock - null out sdev->request_queue after the queue is released to trap any (and there shouldn't be any) use after the queue is freed. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/scsi_sysfs.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 134d3a3e4222..e75ee4671ee3 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -171,6 +171,9 @@ void scsi_device_dev_release(struct device *dev)
if (sdev->request_queue) {
sdev->request_queue->queuedata = NULL;
scsi_free_queue(sdev->request_queue);
+ /* temporary expedient, try to catch use of queue lock
+ * after free of sdev */
+ sdev->request_queue = NULL;
}
scsi_target_reap(scsi_target(sdev));