2 files changed, 4 insertions, 3 deletions

diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 8e9132130142..63cc54289aff 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -699,7 +699,7 @@ static int validate_hardware_logical_block_alignment(struct dm_table *table,
         while (i < dm_table_get_num_targets(table)) {
                 ti = dm_table_get_target(table, i++);
 
-                blk_set_default_limits(&ti_limits);
+                blk_set_stacking_limits(&ti_limits);
 
                 /* combine all target devices' limits */
                 if (ti->type->iterate_devices)
@@ -1221,10 +1221,10 @@ int dm_calculate_queue_limits(struct dm_table *table,
         struct queue_limits ti_limits;
         unsigned i = 0;
 
-        blk_set_default_limits(limits);
+        blk_set_stacking_limits(limits);
 
         while (i < dm_table_get_num_targets(table)) {
-                blk_set_default_limits(&ti_limits);
+                blk_set_stacking_limits(&ti_limits);
 
                 ti = dm_table_get_target(table, i++);
 
diff --git a/drivers/md/md.c b/drivers/md/md.c
index da52acb60f52..9417ae2fa0bb 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -4666,6 +4666,7 @@ static int md_alloc(dev_t dev, char *name)
         mddev->queue->queuedata = mddev;
 
         blk_queue_make_request(mddev->queue, md_make_request);
+        blk_set_stacking_limits(&mddev->queue->limits);
 
         disk = alloc_disk(1 << shift);
         if (!disk) {