1 files changed, 3 insertions, 1 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index 222fe84d6ac4..cfaca8ca6cc4 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -390,11 +390,13 @@ static void __blk_drain_queue(struct request_queue *q, bool drain_all)
                  * be drained.  Check all the queues and counters.
                  */
                 if (drain_all) {
+                        struct blk_flush_queue *fq = blk_get_flush_queue(q);
                         drain |= !list_empty(&q->queue_head);
                         for (i = 0; i < 2; i++) {
                                 drain |= q->nr_rqs[i];
                                 drain |= q->in_flight[i];
-                                drain |= !list_empty(&q->flush_queue[i]);
+                                if (fq)
+                                    drain |= !list_empty(&fq->flush_queue[i]);
                         }
                 }