[SCSI] fix wrong context bugs in SCSI
There's a bug in releasing scsi_device where the release function actually frees the block queue. However, the block queue release calls flush_work(), which requires process context (the scsi_device structure may release from irq context). Update the release function to invoke via the execute_in_process_context() API. Also clean up the scsi_target structure releasing via this API. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
@ -217,8 +217,9 @@ static void scsi_device_cls_release(struct class_device *class_dev)
|
||||
put_device(&sdev->sdev_gendev);
|
||||
}
|
||||
|
||||
static void scsi_device_dev_release(struct device *dev)
|
||||
static void scsi_device_dev_release_usercontext(void *data)
|
||||
{
|
||||
struct device *dev = data;
|
||||
struct scsi_device *sdev;
|
||||
struct device *parent;
|
||||
struct scsi_target *starget;
|
||||
@ -237,6 +238,7 @@ static void scsi_device_dev_release(struct device *dev)
|
||||
|
||||
if (sdev->request_queue) {
|
||||
sdev->request_queue->queuedata = NULL;
|
||||
/* user context needed to free queue */
|
||||
scsi_free_queue(sdev->request_queue);
|
||||
/* temporary expedient, try to catch use of queue lock
|
||||
* after free of sdev */
|
||||
@ -252,6 +254,11 @@ static void scsi_device_dev_release(struct device *dev)
|
||||
put_device(parent);
|
||||
}
|
||||
|
||||
static void scsi_device_dev_release(struct device *dev)
|
||||
{
|
||||
scsi_execute_in_process_context(scsi_device_dev_release_usercontext, dev);
|
||||
}
|
||||
|
||||
static struct class sdev_class = {
|
||||
.name = "scsi_device",
|
||||
.release = scsi_device_cls_release,
|
||||
|
Reference in New Issue
Block a user