diff options
author | Keith Busch <keith.busch@intel.com> | 2014-10-17 17:46:38 -0600 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2015-01-28 09:44:13 -0700 |
commit | 7fb4898e0cd6e7eba7419790921391e53848a35d (patch) | |
tree | f4f866edf02620a83f30d5340c336914a6918339 | |
parent | febf71588c2a750e04dc2a8b0824ce120c48bd9e (diff) | |
download | linux-stable-7fb4898e0cd6e7eba7419790921391e53848a35d.tar.gz linux-stable-7fb4898e0cd6e7eba7419790921391e53848a35d.tar.bz2 linux-stable-7fb4898e0cd6e7eba7419790921391e53848a35d.zip |
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>
-rw-r--r-- | block/blk-core.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 1b5fa214efa3..c81f02cd17d4 100644 --- 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); |