diff options
| author | David S. Miller <davem@davemloft.net> | 2015-05-03 05:05:58 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-03 05:05:58 +0300 |
| commit | 3715544750e4a250f881254900cccebc57509fde (patch) | |
| tree | 478205aefd34a74a0ed2f236c19291973d519fa4 /drivers/md/dm-ioctl.c | |
| parent | 629161f649ca259cfc1473a98347b941dd7a52bc (diff) | |
| parent | 6c3c1eb3c35e8856d6dcb01b412316a676f58bbe (diff) | |
| download | linux-3715544750e4a250f881254900cccebc57509fde.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge net into net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/md/dm-ioctl.c')
| -rw-r--r-- | drivers/md/dm-ioctl.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c index c8a18e4ee9dc..720ceeb7fa9b 100644 --- a/drivers/md/dm-ioctl.c +++ b/drivers/md/dm-ioctl.c @@ -1298,21 +1298,22 @@ static int table_load(struct dm_ioctl *param, size_t param_size) goto err_unlock_md_type; } - if (dm_get_md_type(md) == DM_TYPE_NONE) + if (dm_get_md_type(md) == DM_TYPE_NONE) { /* Initial table load: acquire type of table. */ dm_set_md_type(md, dm_table_get_type(t)); - else if (dm_get_md_type(md) != dm_table_get_type(t)) { + + /* setup md->queue to reflect md's type (may block) */ + r = dm_setup_md_queue(md); + if (r) { + DMWARN("unable to set up device queue for new table."); + goto err_unlock_md_type; + } + } else if (dm_get_md_type(md) != dm_table_get_type(t)) { DMWARN("can't change device type after initial table load."); r = -EINVAL; goto err_unlock_md_type; } - /* setup md->queue to reflect md's type (may block) */ - r = dm_setup_md_queue(md); - if (r) { - DMWARN("unable to set up device queue for new table."); - goto err_unlock_md_type; - } dm_unlock_md_type(md); /* stage inactive table */ |