lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updates for CFQ oops fix

Browse Source 
- 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>
This commit is contained in:
2005-04-12 16:38:09 -05:00
committed by James Bottomley
parent 152587deb8
commit c2a9331c62
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/scsi/scsi_sysfs.c
View File

@@ -171,6 +171,9 @@ void scsi_device_dev_release(struct device *dev)
if (sdev->request_queue) { if (sdev->request_queue) {
sdev->request_queue->queuedata = NULL; sdev->request_queue->queuedata = NULL;
scsi_free_queue(sdev->request_queue); 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)); scsi_target_reap(scsi_target(sdev));

1
include/scsi/scsi_device.h
View File

@@ -43,6 +43,7 @@ struct scsi_device {
struct list_head siblings; /* list of all devices on this host */ struct list_head siblings; /* list of all devices on this host */
struct list_head same_target_siblings; /* just the devices sharing same target id */ struct list_head same_target_siblings; /* just the devices sharing same target id */
/* this is now protected by the request_queue->queue_lock */
volatile unsigned short device_busy; /* commands actually active on low-level */ volatile unsigned short device_busy; /* commands actually active on low-level */
spinlock_t list_lock; spinlock_t list_lock;
struct list_head cmd_list; /* queue of in use SCSI Command structures */ struct list_head cmd_list; /* queue of in use SCSI Command structures */