From 34f88b3a92b0b7b2a89e2706a67c2ead7c6956a5 Mon Sep 17 00:00:00 2001 From: Xiaoguang Wang Date: Sat, 23 Feb 2019 15:37:21 +0800 Subject: [PATCH] blk-mq: place trace_block_getrq() in correct place mainline inclusion from mainline-4.20-rc1 commit d6f1dda27251909a27b8d8aacb498628a1047978 category: bugfix bugzilla: 9637 CVE: NA --------------------------- trace_block_getrq() is to indicate a request struct has been allocated for queue, so put it in right place. Reviewed-by: Jianchao Wang Signed-off-by: Xiaoguang Wang Signed-off-by: Jens Axboe Signed-off-by: Yufen Yu Reviewed-by: Hou Tao Signed-off-by: Yang Yingliang --- block/blk-mq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index e7a23ea38b1f..1218200c2606 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1834,8 +1834,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); @@ -1844,6 +1842,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); -- GitLab