Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-2.6-block.git] / block / blk-mq.c

diff --git a/block/blk-mq.c b/block/blk-mq.c
index dcf10e39995a668d9f9af77ebb0edaf700aef2bb..3f91c6e5b17a95876f2c9c9ccf7cc481f159c8cc 100644 (file)
--- 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);