2 files changed, 5 insertions, 4 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index f6452f692501..94d88fabc4bd 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -498,6 +498,11 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)
 
         q->backing_dev_info.unplug_io_fn = blk_backing_dev_unplug;
         q->backing_dev_info.unplug_io_data = q;
+        q->backing_dev_info.ra_pages =
+                        (VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE;
+        q->backing_dev_info.state = 0;
+        q->backing_dev_info.capabilities = BDI_CAP_MAP_COPY;
+
         err = bdi_init(&q->backing_dev_info);
         if (err) {
                 kmem_cache_free(blk_requestq_cachep, q);
diff --git a/block/blk-settings.c b/block/blk-settings.c
index d71cedc09c4e..138610b98956 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -129,10 +129,6 @@ void blk_queue_make_request(struct request_queue *q, make_request_fn *mfn)
         blk_queue_max_segment_size(q, MAX_SEGMENT_SIZE);
 
         q->make_request_fn = mfn;
-        q->backing_dev_info.ra_pages =
-                        (VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE;
-        q->backing_dev_info.state = 0;
-        q->backing_dev_info.capabilities = BDI_CAP_MAP_COPY;
         blk_queue_max_sectors(q, SAFE_MAX_SECTORS);
         blk_queue_logical_block_size(q, 512);
         blk_queue_dma_alignment(q, 511);