2 files changed, 18 insertions, 4 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 0bac91e72370..ec1803a48723 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -74,8 +74,6 @@ struct kmem_cache *scsi_sdb_cache;
 */
 #define SCSI_QUEUE_DELAY        3
-static void scsi_run_queue(struct request_queue *q);
 /*
 * Function:    scsi_unprep_request()
 *
@@ -161,7 +159,7 @@ static int __scsi_queue_insert(struct scsi_cmnd *cmd, int reason, int unbusy)
        blk_requeue_request(q, cmd->request);
        spin_unlock_irqrestore(q->queue_lock, flags);
-        scsi_run_queue(q);
+        kblockd_schedule_work(q, &device->requeue_work);
        return 0;
 }
@@ -438,7 +436,11 @@ static void scsi_run_queue(struct request_queue *q)
                        continue;
                }
-                blk_run_queue_async(sdev->request_queue);
+                spin_unlock(shost->host_lock);
+                spin_lock(sdev->request_queue->queue_lock);
+                __blk_run_queue(sdev->request_queue);
+                spin_unlock(sdev->request_queue->queue_lock);
+                spin_lock(shost->host_lock);
        }
        /* put any unprocessed entries back */
        list_splice(&starved_list, &shost->starved_list);
@@ -447,6 +449,16 @@ static void scsi_run_queue(struct request_queue *q)
        blk_run_queue(q);
 }
+void scsi_requeue_run_queue(struct work_struct *work)
+{
+        struct scsi_device *sdev;
+        struct request_queue *q;
+        sdev = container_of(work, struct scsi_device, requeue_work);
+        q = sdev->request_queue;
+        scsi_run_queue(q);
+}
 /*
 * Function:    scsi_requeue_command()
 *
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 087821fac8fe..58584dc0724a 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -242,6 +242,7 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,
        int display_failure_msg = 1, ret;
        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
        extern void scsi_evt_thread(struct work_struct *work);
+        extern void scsi_requeue_run_queue(struct work_struct *work);
        sdev = kzalloc(sizeof(*sdev) + shost->transportt->device_size,
                       GFP_ATOMIC);
@@ -264,6 +265,7 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,
        INIT_LIST_HEAD(&sdev->event_list);
        spin_lock_init(&sdev->list_lock);
        INIT_WORK(&sdev->event_work, scsi_evt_thread);
+        INIT_WORK(&sdev->requeue_work, scsi_requeue_run_queue);
        sdev->sdev_gendev.parent = get_device(&starget->dev);
        sdev->sdev_target = starget;