1 files changed, 6 insertions, 4 deletions

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 2758cdf2de94..d39e8a5eaeaa 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -508,20 +508,22 @@ void blk_mq_kick_requeue_list(struct request_queue *q)
 }
 EXPORT_SYMBOL(blk_mq_kick_requeue_list);
 
-static inline bool is_flush_request(struct request *rq, unsigned int tag)
+static inline bool is_flush_request(struct request *rq,
+                struct blk_flush_queue *fq, unsigned int tag)
 {
         return ((rq->cmd_flags & REQ_FLUSH_SEQ) &&
-                        rq->q->flush_rq->tag == tag);
+                        fq->flush_rq->tag == tag);
 }
 
 struct request *blk_mq_tag_to_rq(struct blk_mq_tags *tags, unsigned int tag)
 {
         struct request *rq = tags->rqs[tag];
+        struct blk_flush_queue *fq = blk_get_flush_queue(rq->q);
 
-        if (!is_flush_request(rq, tag))
+        if (!is_flush_request(rq, fq, tag))
                 return rq;
 
-        return rq->q->flush_rq;
+        return fq->flush_rq;
 }
 EXPORT_SYMBOL(blk_mq_tag_to_rq);