1 files changed, 2 insertions, 1 deletions

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index eb5e94803892..95bb551273ab 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1101,7 +1101,8 @@ static inline bool blk_needs_flush_plug(struct task_struct *tsk)
 /*
  * tag stuff
  */
-#define blk_rq_tagged(rq)               ((rq)->cmd_flags & REQ_QUEUED)
+#define blk_rq_tagged(rq) \
+        ((rq)->mq_ctx || ((rq)->cmd_flags & REQ_QUEUED))
 extern int blk_queue_start_tag(struct request_queue *, struct request *);
 extern struct request *blk_queue_find_tag(struct request_queue *, int);
 extern void blk_queue_end_tag(struct request_queue *, struct request *);