diff options
author | Omar Sandoval <osandov@fb.com> | 2017-02-27 18:47:55 +0100 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2017-03-02 16:56:04 +0100 |
commit | 562bef4259776c19cb2423d43af1f99183910a4d (patch) | |
tree | 44ff290db12ef692a735e84022de74d80c60098c /block | |
parent | blk-mq: kill blk_mq_set_alloc_data() (diff) | |
download | linux-562bef4259776c19cb2423d43af1f99183910a4d.tar.xz linux-562bef4259776c19cb2423d43af1f99183910a4d.zip |
blk-mq: move update of tags->rqs to __blk_mq_alloc_request()
No functional difference, it just makes a little more sense to update
the tag map where we actually allocate the tag.
Signed-off-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Tested-by: Sagi Grimberg <sagi@grimberg.me>
Diffstat (limited to 'block')
-rw-r--r-- | block/blk-mq-sched.c | 2 | ||||
-rw-r--r-- | block/blk-mq.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c index 5697b23412a1..09af8ff18719 100644 --- a/block/blk-mq-sched.c +++ b/block/blk-mq-sched.c @@ -134,8 +134,6 @@ struct request *blk_mq_sched_get_request(struct request_queue *q, rq = __blk_mq_alloc_request(data, op); } else { rq = __blk_mq_alloc_request(data, op); - if (rq) - data->hctx->tags->rqs[rq->tag] = rq; } if (rq) { diff --git a/block/blk-mq.c b/block/blk-mq.c index 85a7047d8b03..94593c6282d8 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -234,6 +234,7 @@ struct request *__blk_mq_alloc_request(struct blk_mq_alloc_data *data, } rq->tag = tag; rq->internal_tag = -1; + data->hctx->tags->rqs[rq->tag] = rq; } blk_mq_rq_ctx_init(data->q, data->ctx, rq, op); |