diff options
| author | Bart Van Assche <bart.vanassche@wdc.com> | 2017-08-09 11:32:16 -0700 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2017-08-28 10:01:33 -0400 |
| commit | d5c27f3ffbc2ee2d2f74ebfa1b2d789f67e9b3f1 (patch) | |
| tree | b86e98206172cb0b2b30bb13704248b6bbf990d6 /drivers/md/dm-rq.c | |
| parent | 9157c8d3e2d318581ecc8bdf34367d57f19c5380 (diff) | |
| download | linux-stable-d5c27f3ffbc2ee2d2f74ebfa1b2d789f67e9b3f1.tar.gz linux-stable-d5c27f3ffbc2ee2d2f74ebfa1b2d789f67e9b3f1.tar.bz2 linux-stable-d5c27f3ffbc2ee2d2f74ebfa1b2d789f67e9b3f1.zip | |
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>
Diffstat (limited to 'drivers/md/dm-rq.c')
| -rw-r--r-- | drivers/md/dm-rq.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c index c6ebc5b1e00e..cbee09054d1e 100644 --- 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); } |