summaryrefslogtreecommitdiffstats
path: root/block/blk-mq.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2017-01-12 10:04:45 -0700
committerJens Axboe <axboe@fb.com>2017-01-17 10:04:09 -0700
commitfd2d332677c687ca90c12a47d6c377c547100b56 (patch)
tree1a1c0e04dc9828d4b7475ae9597ba75aadbd4724 /block/blk-mq.c
parentcc71a6f43886a8af57dbbce2a45b4b2aaf570fe6 (diff)
downloadlinux-fd2d332677c687ca90c12a47d6c377c547100b56.tar.bz2
blk-mq: add support for carrying internal tag information in blk_qc_t
No functional change in this patch, just in preparation for having two types of tags available to the block layer for a single request. Signed-off-by: Jens Axboe <axboe@fb.com> Reviewed-by: Omar Sandoval <osandov@fb.com>
Diffstat (limited to 'block/blk-mq.c')
-rw-r--r--block/blk-mq.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c
index fcdeadc55753..d40be641f3d5 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1308,6 +1308,11 @@ static struct request *blk_mq_map_request(struct request_queue *q,
return rq;
}
+static blk_qc_t request_to_qc_t(struct blk_mq_hw_ctx *hctx, struct request *rq)
+{
+ return blk_tag_to_qc_t(rq->tag, hctx->queue_num, false);
+}
+
static void blk_mq_try_issue_directly(struct request *rq, blk_qc_t *cookie)
{
int ret;
@@ -1318,7 +1323,7 @@ static void blk_mq_try_issue_directly(struct request *rq, blk_qc_t *cookie)
.list = NULL,
.last = 1
};
- blk_qc_t new_cookie = blk_tag_to_qc_t(rq->tag, hctx->queue_num);
+ blk_qc_t new_cookie = request_to_qc_t(hctx, rq);
if (blk_mq_hctx_stopped(hctx))
goto insert;
@@ -1387,7 +1392,7 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio)
wbt_track(&rq->issue_stat, wb_acct);
- cookie = blk_tag_to_qc_t(rq->tag, data.hctx->queue_num);
+ cookie = request_to_qc_t(data.hctx, rq);
if (unlikely(is_flush_fua)) {
blk_mq_bio_to_request(rq, bio);
@@ -1496,7 +1501,7 @@ static blk_qc_t blk_sq_make_request(struct request_queue *q, struct bio *bio)
wbt_track(&rq->issue_stat, wb_acct);
- cookie = blk_tag_to_qc_t(rq->tag, data.hctx->queue_num);
+ cookie = request_to_qc_t(data.hctx, rq);
if (unlikely(is_flush_fua)) {
blk_mq_bio_to_request(rq, bio);