summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShaohua Li <shli@fb.com>2015-05-08 10:51:31 -0700
committerJens Axboe <axboe@fb.com>2015-05-08 14:17:19 -0600
commit239ad215f0d8388cbe6c09a0fab8ad8ff5dba420 (patch)
treed1525efb74bed517f68017891a0f2ed6bae60bea
parente6c4438ba7cb615448492849970aaf0aaa1cc973 (diff)
downloadop-kernel-dev-239ad215f0d8388cbe6c09a0fab8ad8ff5dba420.zip
op-kernel-dev-239ad215f0d8388cbe6c09a0fab8ad8ff5dba420.tar.gz
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. Signed-off-by: Shaohua Li <shli@fb.com> Signed-off-by: Jens Axboe <axboe@fb.com>
-rw-r--r--block/blk-mq.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c
index a65acff..f13d0de 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1284,6 +1284,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;
}
}
OpenPOWER on IntegriCloud