summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorXiaoguang Wang <xiaoguang.wang@linux.alibaba.com>2018-10-23 22:30:50 +0800
committerJens Axboe <axboe@kernel.dk>2018-10-25 11:17:40 -0600
commitd6f1dda27251909a27b8d8aacb498628a1047978 (patch)
tree40785f422d784e6f96b86bedaea0ab8818250003 /block
parentbf5054569653c491ece544cc7ee333ae53b47121 (diff)
downloadlinux-d6f1dda27251909a27b8d8aacb498628a1047978.tar.gz
linux-d6f1dda27251909a27b8d8aacb498628a1047978.tar.bz2
linux-d6f1dda27251909a27b8d8aacb498628a1047978.zip
blk-mq: place trace_block_getrq() in correct place
trace_block_getrq() is to indicate a request struct has been allocated for queue, so put it in right place. Reviewed-by: Jianchao Wang <jianchao.w.wang@oracle.com> Signed-off-by: Xiaoguang Wang <xiaoguang.wang@linux.alibaba.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r--block/blk-mq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c
index dcf10e39995a..3f91c6e5b17a 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1850,8 +1850,6 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio)
rq_qos_throttle(q, bio, NULL);
- trace_block_getrq(q, bio, bio->bi_opf);
-
rq = blk_mq_get_request(q, bio, bio->bi_opf, &data);
if (unlikely(!rq)) {
rq_qos_cleanup(q, bio);
@@ -1860,6 +1858,8 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio)
return BLK_QC_T_NONE;
}
+ trace_block_getrq(q, bio, bio->bi_opf);
+
rq_qos_track(q, rq, bio);
cookie = request_to_qc_t(data.hctx, rq);