Commit c2a9331c authored by 's avatar Committed by James Bottomley

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: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 152587de
......@@ -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));
......
......@@ -43,6 +43,7 @@ struct scsi_device {
struct list_head siblings; /* list of all devices on this host */
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 */
spinlock_t list_lock;
struct list_head cmd_list; /* queue of in use SCSI Command structures */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment