summaryrefslogtreecommitdiffstats
path: root/drivers/md/dm-rq.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/md/dm-rq.c')
-rw-r--r--drivers/md/dm-rq.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c
index 8eefc0ad7a59..877b8f33620e 100644
--- a/drivers/md/dm-rq.c
+++ b/drivers/md/dm-rq.c
@@ -336,19 +336,28 @@ static void dm_old_requeue_request(struct request *rq)
336 spin_unlock_irqrestore(q->queue_lock, flags); 336 spin_unlock_irqrestore(q->queue_lock, flags);
337} 337}
338 338
339static void dm_mq_delay_requeue_request(struct request *rq, unsigned long msecs) 339static void __dm_mq_kick_requeue_list(struct request_queue *q, unsigned long msecs)
340{ 340{
341 struct request_queue *q = rq->q;
342 unsigned long flags; 341 unsigned long flags;
343 342
344 blk_mq_requeue_request(rq);
345
346 spin_lock_irqsave(q->queue_lock, flags); 343 spin_lock_irqsave(q->queue_lock, flags);
347 if (!blk_queue_stopped(q)) 344 if (!blk_queue_stopped(q))
348 blk_mq_delay_kick_requeue_list(q, msecs); 345 blk_mq_delay_kick_requeue_list(q, msecs);
349 spin_unlock_irqrestore(q->queue_lock, flags); 346 spin_unlock_irqrestore(q->queue_lock, flags);
350} 347}
351 348
349void dm_mq_kick_requeue_list(struct mapped_device *md)
350{
351 __dm_mq_kick_requeue_list(dm_get_md_queue(md), 0);
352}
353EXPORT_SYMBOL(dm_mq_kick_requeue_list);
354
355static void dm_mq_delay_requeue_request(struct request *rq, unsigned long msecs)
356{
357 blk_mq_requeue_request(rq);
358 __dm_mq_kick_requeue_list(rq->q, msecs);
359}
360
352static void dm_requeue_original_request(struct dm_rq_target_io *tio, bool delay_requeue) 361static void dm_requeue_original_request(struct dm_rq_target_io *tio, bool delay_requeue)
353{ 362{
354 struct mapped_device *md = tio->md; 363 struct mapped_device *md = tio->md;