Merge branch 'for-4.15/block' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / drivers / md / dm.c

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 8aaffa1..a3f8cbb 100644 (file)
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1618,17 +1618,6 @@ static void dm_wq_work(struct work_struct *work);
 
 void dm_init_md_queue(struct mapped_device *md)
 {
-       /*
-        * Request-based dm devices cannot be stacked on top of bio-based dm
-        * devices.  The type of this dm device may not have been decided yet.
-        * The type is decided at the first table loading time.
-        * To prevent problematic device stacking, clear the queue flag
-        * for request stacking support until then.
-        *
-        * 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