From 7d0ee532b61b7636e859bf84a474302b683c8bf2 Mon Sep 17 00:00:00 2001 From: Shaohua Li Date: Fri, 8 May 2015 10:51:31 -0700 Subject: [PATCH] blk-mq: avoid re-initialize request which is failed in direct dispatch If we directly issue a request and it fails, we use blk_mq_merge_queue_io(). But we already assigned bio to a request in blk_mq_bio_to_request. blk_mq_merge_queue_io shouldn't run blk_mq_bio_to_request again. Orabug: 26339553 Suggested-by: Jianchao Wang Signed-off-by: Shaohua Li Signed-off-by: Jens Axboe (cherry picked from commit 239ad215f0d8388cbe6c09a0fab8ad8ff5dba420) Reviewed-by: Boris Ostrovsky Reviewed-by: Bhavesh Davda Signed-off-by: Ankur Arora --- block/blk-mq.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/block/blk-mq.c b/block/blk-mq.c index ed0a92268c76..93246bc6ec75 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1273,6 +1273,8 @@ static void blk_mq_make_request(struct request_queue *q, struct bio *bio) blk_mq_end_request(rq, rq->errors); goto done; } + blk_mq_insert_request(rq, false, true, true); + return; } } -- 2.50.1