openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Bart Van Assche 2017-08-09 11:32:16 -07:00 committed by Mike Snitzer
parent 9157c8d3e2
commit d5c27f3ffb
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/md/dm-rq.c
View File

@ -237,14 +237,14 @@ static void dm_end_request(struct request *clone, blk_status_t error)
/* /*
* Requeue the original request of a clone. * 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; struct request_queue *q = rq->q;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(q->queue_lock, flags); spin_lock_irqsave(q->queue_lock, flags);
blk_requeue_request(q, rq); blk_requeue_request(q, rq);
blk_run_queue_async(q); blk_delay_queue(q, delay_ms);
spin_unlock_irqrestore(q->queue_lock, flags); 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 mapped_device *md = tio->md;
struct request *rq = tio->orig; struct request *rq = tio->orig;
int rw = rq_data_dir(rq); int rw = rq_data_dir(rq);
unsigned long delay_ms = delay_requeue ? 100 : 0;
rq_end_stats(md, rq); rq_end_stats(md, rq);
if (tio->clone) { 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) if (!rq->q->mq_ops)
dm_old_requeue_request(rq); dm_old_requeue_request(rq, delay_ms);
else 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); rq_completed(md, rw, false);
} }