block: add blk-mq support to blk_insert_cloned_request()

If the request passed to blk_insert_cloned_request() was allocated by
a blk-mq device it must be submitted using blk_mq_insert_request().

Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/block/blk-core.c b/block/blk-core.c
index 1b5fa214efa37c89f0f3177c2e8d5186bbf131bc..c81f02cd17d4c0bb8dd7de5673c9b56f9812c6fb 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -2048,6 +2048,13 @@ int blk_insert_cloned_request(struct request_queue *q, struct request *rq)
            should_fail_request(&rq->rq_disk->part0, blk_rq_bytes(rq)))
                return -EIO;
 
+       if (q->mq_ops) {
+               if (blk_queue_io_stat(q))
+                       blk_account_io_start(rq, true);
+               blk_mq_insert_request(rq, false, true, true);
+               return 0;
+       }
+
        spin_lock_irqsave(q->queue_lock, flags);
        if (unlikely(blk_queue_dying(q))) {
                spin_unlock_irqrestore(q->queue_lock, flags);