2 files changed, 4 insertions, 3 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index 0a9d17269957..222fe84d6ac4 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -600,9 +600,6 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)
 #ifdef CONFIG_BLK_CGROUP
         INIT_LIST_HEAD(&q->blkg_list);
 #endif
-        INIT_LIST_HEAD(&q->flush_queue[0]);
-        INIT_LIST_HEAD(&q->flush_queue[1]);
-        INIT_LIST_HEAD(&q->flush_data_in_flight);
         INIT_DELAYED_WORK(&q->delay_work, blk_delay_work);
 
         kobject_init(&q->kobj, &blk_queue_ktype);
diff --git a/block/blk-flush.c b/block/blk-flush.c
index c72ab32fd8eb..a49ffbdcfcdc 100644
--- a/block/blk-flush.c
+++ b/block/blk-flush.c
@@ -488,6 +488,10 @@ static int blk_mq_init_flush(struct request_queue *q)
 
 int blk_init_flush(struct request_queue *q)
 {
+        INIT_LIST_HEAD(&q->flush_queue[0]);
+        INIT_LIST_HEAD(&q->flush_queue[1]);
+        INIT_LIST_HEAD(&q->flush_data_in_flight);
+
         if (q->mq_ops)
                 return blk_mq_init_flush(q);