Gitweb:
https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=22a13043683a5647e8c...
Commit: 22a13043683a5647e8cc4e3aead911e5269ffd2f
Parent: 61600f8fa7e150b02c1be5e1f8ee1b008b4efa90
Author: Heinz Mauelshagen <heinzm(a)redhat.com>
AuthorDate: Fri Aug 31 19:03:52 2018 +0200
Committer: Heinz Mauelshagen <heinzm(a)redhat.com>
CommitterDate: Fri Aug 31 19:04:19 2018 +0200
lvconvert: avoid superfluous interim raid type
When converting striped/raid0*/raid6_n_6 <-> raid4,
avoid superfluous interim raid5_n layout.
Related: rhbz1447809
---
lib/metadata/raid_manip.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 6cbf601..2bc179a 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -6130,7 +6130,7 @@ static int _set_convenient_raid145610_segtype_to(const struct
lv_segment *seg_fr
seg_flag = SEG_RAID6_N_6;
if (segtype_is_linear(*segtype) ||
- (!segtype_is_raid10(*segtype) && !segtype_is_striped(*segtype)))
+ (!segtype_is_raid4(*segtype) && !segtype_is_raid10(*segtype) &&
!segtype_is_striped(*segtype)))
seg_flag = SEG_RAID5_N;
/* raid1 -> */
@@ -6199,10 +6199,9 @@ static int _set_convenient_raid145610_segtype_to(const struct
lv_segment *seg_fr
lvseg_name(seg_from), display_lvname(seg_from->lv), *new_image_count);
}
- /* raid4 -> !raid4/raid5* */
- } else if (seg_is_raid4(seg_from) &&
- !segtype_is_raid4(*segtype) && !segtype_is_any_raid5(*segtype)) {
- seg_flag = SEG_RAID5_N;
+ /* raid4 -> * */
+ } else if (seg_is_raid4(seg_from) && !segtype_is_raid4(*segtype) &&
!segtype_is_striped(*segtype)) {
+ seg_flag = segtype_is_any_raid6(*segtype) ? SEG_RAID6_N_6 : SEG_RAID5_N;
/* raid6 -> striped/raid0/raid5/raid10 */
} else if (seg_is_any_raid6(seg_from)) {