diff options
| author | Marian Csontos <mcsontos@redhat.com> | 2017-04-27 10:31:27 +0200 |
|---|---|---|
| committer | Marian Csontos <mcsontos@redhat.com> | 2017-04-27 10:31:27 +0200 |
| commit | c0a87cc8e686138b5610ef8c871ddbe7c5689765 (patch) | |
| tree | 9444498a40987c3610d4ddb5df54c699245ff003 | |
| parent | 41933292c64b675615d6d240d9e2e831193b7b4b (diff) | |
| download | lvm2-dev-mcsontos-reverts.tar.gz | |
Revert "lvconvert: preserve region size on raid1 image count changes"dev-mcsontos-reverts
This reverts commit 8333d5a969042a321f00656271bd55a37c1ea179.
| -rw-r--r-- | WHATS_NEW | 2 | ||||
| -rw-r--r-- | tools/lvconvert.c | 11 |
2 files changed, 3 insertions, 10 deletions
@@ -1,7 +1,5 @@ Version 2.02.171 - ================================== - lvconvert - preserve region size on raid1 image count changes - raid - sanely handle insufficient space on takeover Fix configure --enable-notify-dbus status message. Change configure option name prefix from --enable-lockd to --enable-lvmlockd. lvcreate - raise mirror/raid default regionsize to 2MiB diff --git a/tools/lvconvert.c b/tools/lvconvert.c index 22555f37e..04201d066 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -60,7 +60,6 @@ struct lvconvert_params { int need_polling; uint32_t region_size; - unsigned region_size_supplied; uint32_t mirrors; sign_t mirrors_sign; @@ -248,13 +247,10 @@ static int _read_params(struct cmd_context *cmd, struct lvconvert_params *lp) return 0; } - if (arg_is_set(cmd, regionsize_ARG)) { + if (arg_is_set(cmd, regionsize_ARG)) lp->region_size = arg_uint_value(cmd, regionsize_ARG, 0); - lp->region_size_supplied = 1; - } else { + else lp->region_size = get_default_region_size(cmd); - lp->region_size_supplied = 0; - } /* FIXME man page says in one place that --type and --mirrors can't be mixed */ if (lp->mirrors_supplied && !lp->mirrors) @@ -1364,8 +1360,7 @@ static int _lvconvert_raid(struct logical_volume *lv, struct lvconvert_params *l DEFAULT_RAID1_MAX_IMAGES, lp->segtype->name, display_lvname(lv)); return 0; } - if (!lv_raid_change_image_count(lv, lp->yes, image_count, - lp->region_size_supplied ? lp->region_size : seg->region_size , lp->pvh)) + if (!lv_raid_change_image_count(lv, lp->yes, image_count, lp->region_size, lp->pvh)) return_0; log_print_unless_silent("Logical volume %s successfully converted.", |