summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorOmar Sandoval <osandov@fb.com>2016-06-08 18:22:20 -0700
committerJens Axboe <axboe@fb.com>2016-06-09 09:55:15 -0600
commit52b9c330c6a8a4b5a1819bdaddf4ec76ab571e81 (patch)
tree2562975e06a4fe0d1263ebd0db94161b3f8a76f2 /block
parentca93e45347e61cd85e5d71961f6c94fad143593d (diff)
downloadlinux-stable-52b9c330c6a8a4b5a1819bdaddf4ec76ab571e81.tar.gz
linux-stable-52b9c330c6a8a4b5a1819bdaddf4ec76ab571e81.tar.bz2
linux-stable-52b9c330c6a8a4b5a1819bdaddf4ec76ab571e81.zip
blk-mq: actually hook up defer list when running requests
If ->queue_rq() returns BLK_MQ_RQ_QUEUE_OK, we use continue and skip over the rest of the loop body. However, dptr is assigned later in the loop body, and the BLK_MQ_RQ_QUEUE_OK case is exactly the case that we'd want it for. NVMe isn't actually using BLK_MQ_F_DEFER_ISSUE yet, nor is any other in-tree driver, but if the code's going to be there, it might as well work. Fixes: 74c450521dd8 ("blk-mq: add a 'list' parameter to ->queue_rq()") Signed-off-by: Omar Sandoval <osandov@fb.com> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block')
-rw-r--r--block/blk-mq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 13f460368759..bc7166d27340 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -785,7 +785,7 @@ static void __blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx)
switch (ret) {
case BLK_MQ_RQ_QUEUE_OK:
queued++;
- continue;
+ break;
case BLK_MQ_RQ_QUEUE_BUSY:
list_add(&rq->queuelist, &rq_list);
__blk_mq_requeue_request(rq);