Merge tag 'for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power...

[linux-beck.git] / drivers / md / dm-ioctl.c

diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index 80a43954325966a872cf8ebc95fb23c92c0b8819..2adf81d81fca4237f6c911211a0d5b0dc21546d1 100644 (file)
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -1291,7 +1291,8 @@ static int table_load(struct dm_ioctl *param, size_t param_size)
 
        immutable_target_type = dm_get_immutable_target_type(md);
        if (immutable_target_type &&
-           (immutable_target_type != dm_table_get_immutable_target_type(t))) {
+           (immutable_target_type != dm_table_get_immutable_target_type(t)) &&
+           !dm_table_get_wildcard_target(t)) {
                DMWARN("can't replace immutable target type %s",
                       immutable_target_type->name);
                r = -EINVAL;
@@ -1303,7 +1304,7 @@ static int table_load(struct dm_ioctl *param, size_t param_size)
                dm_set_md_type(md, dm_table_get_type(t));
 
                /* setup md->queue to reflect md's type (may block) */
-               r = dm_setup_md_queue(md);
+               r = dm_setup_md_queue(md, t);
                if (r) {
                        DMWARN("unable to set up device queue for new table.");
                        goto err_unlock_md_type;