1 files changed, 7 insertions, 3 deletions

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 6264781dc69a..77ebb985154c 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -2197,6 +2197,13 @@ static void dm_init_md_queue(struct mapped_device *md)
          * This queue is new, so no concurrency on the queue_flags.
          */
         queue_flag_clear_unlocked(QUEUE_FLAG_STACKABLE, md->queue);
+
+        /*
+         * Initialize data that will only be used by a non-blk-mq DM queue
+         * - must do so here (in alloc_dev callchain) before queue is used
+         */
+        md->queue->queuedata = md;
+        md->queue->backing_dev_info.congested_data = md;
 }
 
 static void dm_init_old_md_queue(struct mapped_device *md)
@@ -2207,10 +2214,7 @@ static void dm_init_old_md_queue(struct mapped_device *md)
         /*
          * Initialize aspects of queue that aren't relevant for blk-mq
          */
-        md->queue->queuedata = md;
         md->queue->backing_dev_info.congested_fn = dm_any_congested;
-        md->queue->backing_dev_info.congested_data = md;
-
         blk_queue_bounce_limit(md->queue, BLK_BOUNCE_ANY);
 }