summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinz Mauelshagen <heinzm@redhat.com>2017-04-06 19:09:05 +0200
committerHeinz Mauelshagen <heinzm@redhat.com>2017-04-06 19:09:05 +0200
commit3b1a96b9b3650f8776e9d09573bc7754f283e234 (patch)
treeda4358f1e72591597ea78406056a1e583932f1cd
parent0f65d7ec3a7325165af1a9f722cb760fd363e932 (diff)
downloadlvm2-3b1a96b9b3650f8776e9d09573bc7754f283e234.tar.gz
lvconvert: avoid error message on raid1 -> raid4 conversion
Avoid error message "Logical Volume *_rimage_0 already exists in volume group,,," on takeover conversion from a 2-legged raid1 to raid4 (aiming to reshape it adding images). Resolves: rhbz1439398
-rw-r--r--lib/metadata/raid_manip.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 8c58f3c91..f360254bc 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -5099,7 +5099,6 @@ static int _takeover_upconvert_wrapper(TAKEOVER_FN_ARGS)
!_clear_meta_lvs(lv))
return_0;
-
extents_copied = seg->extents_copied;
seg_len = seg->len;
stripe_size = seg->stripe_size;
@@ -5166,7 +5165,8 @@ static int _takeover_upconvert_wrapper(TAKEOVER_FN_ARGS)
_pre_raid_add_legs, NULL))
return 0;
- if (segtype_is_raid4(new_segtype)) {
+ if (segtype_is_raid4(new_segtype) &&
+ seg->area_count != 2) {
/* We had to rename SubLVs because of collision free shifting, rename back... */
if (!_rename_area_lvs(lv, NULL))
return_0;