dm rq: make dm-sq requeuing behavior consistent with dm-mq behavior

DM_MAPIO_DELAY_REQUEUE causes dm-mq to requeue after a delay but
causes dm-sq to requeue immediately.  Make the behavior of dm-sq
consistent with that of dm-mq.

Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>

diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c
index c6ebc5b1e00eb8be80e94ea2f31c190613fb4244..cbee09054d1eb18bb0c7575023f07f5895dfb758 100644 (file)
--- a/drivers/md/dm-rq.c
+++ b/drivers/md/dm-rq.c
@@ -237,14 +237,14 @@ static void dm_end_request(struct request *clone, blk_status_t error)
 /*
  * Requeue the original request of a clone.
  */
-static void dm_old_requeue_request(struct request *rq)
+static void dm_old_requeue_request(struct request *rq, unsigned long delay_ms)
 {
        struct request_queue *q = rq->q;
        unsigned long flags;
 
        spin_lock_irqsave(q->queue_lock, flags);
        blk_requeue_request(q, rq);
-       blk_run_queue_async(q);
+       blk_delay_queue(q, delay_ms);
        spin_unlock_irqrestore(q->queue_lock, flags);
 }
 
@@ -270,6 +270,7 @@ static void dm_requeue_original_request(struct dm_rq_target_io *tio, bool delay_
        struct mapped_device *md = tio->md;
        struct request *rq = tio->orig;
        int rw = rq_data_dir(rq);
+       unsigned long delay_ms = delay_requeue ? 100 : 0;
 
        rq_end_stats(md, rq);
        if (tio->clone) {
@@ -278,9 +279,9 @@ static void dm_requeue_original_request(struct dm_rq_target_io *tio, bool delay_
        }
 
        if (!rq->q->mq_ops)
-               dm_old_requeue_request(rq);
+               dm_old_requeue_request(rq, delay_ms);
        else
-               dm_mq_delay_requeue_request(rq, delay_requeue ? 100/*ms*/ : 0);
+               dm_mq_delay_requeue_request(rq, delay_ms);
 
        rq_completed(md, rw, false);
 }