aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiaoguang Wang <xiaoguang.wang@linux.alibaba.com>2018-10-23 10:30:50 -0400
committerJens Axboe <axboe@kernel.dk>2018-10-25 13:17:40 -0400
commitd6f1dda27251909a27b8d8aacb498628a1047978 (patch)
tree40785f422d784e6f96b86bedaea0ab8818250003
parentbf5054569653c491ece544cc7ee333ae53b47121 (diff)
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>
-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)
1850 1850
1851 rq_qos_throttle(q, bio, NULL); 1851 rq_qos_throttle(q, bio, NULL);
1852 1852
1853 trace_block_getrq(q, bio, bio->bi_opf);
1854
1855 rq = blk_mq_get_request(q, bio, bio->bi_opf, &data); 1853 rq = blk_mq_get_request(q, bio, bio->bi_opf, &data);
1856 if (unlikely(!rq)) { 1854 if (unlikely(!rq)) {
1857 rq_qos_cleanup(q, bio); 1855 rq_qos_cleanup(q, bio);
@@ -1860,6 +1858,8 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio)
1860 return BLK_QC_T_NONE; 1858 return BLK_QC_T_NONE;
1861 } 1859 }
1862 1860
1861 trace_block_getrq(q, bio, bio->bi_opf);
1862
1863 rq_qos_track(q, rq, bio); 1863 rq_qos_track(q, rq, bio);
1864 1864
1865 cookie = request_to_qc_t(data.hctx, rq); 1865 cookie = request_to_qc_t(data.hctx, rq);