mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-21 13:34:40 +03:00
Revert "lvconvert: preserve region size on raid1 image count changes"
This reverts commit 8333d5a969
.
This commit is contained in:
parent
813bcb24f0
commit
af47ec9f51
@ -1,8 +1,7 @@
|
||||
Version 2.02.171 -
|
||||
==================================
|
||||
Adjust pvresize messages and add prompt if underlying dev size differs.
|
||||
lvconvert - preserve region size on raid1 image count changes
|
||||
raid - sanely handle insufficient space on takeover
|
||||
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
|
||||
|
@ -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.",
|
||||
|
Loading…
Reference in New Issue
Block a user