From dd88a0f05cb27d54aa74960bbe9370fa37197cdc Mon Sep 17 00:00:00 2001
From: Heinz Mauelshagen <heinzm@redhat.com>
Date: Fri, 9 Mar 2018 21:15:41 +0100
Subject: [PATCH] raid: support raid5_n convenience type on conversion to
 raid10

Fix requesting a conversion on raid5_{ls,rs,la,ra} -> raid10
not offering offering interim convenience type raid5_n.

Resolves: rhbz1468600
---
 WHATS_NEW                               |  1 +
 lib/metadata/raid_manip.c               |  2 +-
 test/shell/lvconvert-raid5_to_raid10.sh | 63 +++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 test/shell/lvconvert-raid5_to_raid10.sh

diff --git a/WHATS_NEW b/WHATS_NEW
index 16ad1d97b..40f81f521 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.178 - 
 =====================================
+  Offer convenience type raid5_n converting to raid10
   Automatically avoid reading invalid snapshots during device scan.
   Ensure COW device is writable even for read-only thick snapshots.
   Support activation of component LVs in read-only mode.
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 0f561209e..7d82a24b8 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -6119,7 +6119,7 @@ static int _set_convenient_raid145610_segtype_to(const struct lv_segment *seg_fr
 				return 0;
 			}
 
-			seg_flag = SEG_RAID0_META;
+			seg_flag = seg_is_raid5_n(seg_from) ? SEG_RAID0_META : SEG_RAID5_N;
 
 		} else if (segtype_is_any_raid6(*segtype)) {
 			if (seg_from->area_count < 4) {
diff --git a/test/shell/lvconvert-raid5_to_raid10.sh b/test/shell/lvconvert-raid5_to_raid10.sh
new file mode 100644
index 000000000..cc0e4684a
--- /dev/null
+++ b/test/shell/lvconvert-raid5_to_raid10.sh
@@ -0,0 +1,63 @@
+#!/usr/bin/env bash
+
+# Copyright (C) 2018 Red Hat, Inc. All rights reserved.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions
+# of the GNU General Public License v.2.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA2110-1301 USA
+
+SKIP_WITH_LVMLOCKD=1
+SKIP_WITH_LVMPOLLD=1
+
+. lib/inittest
+
+which mkfs.ext4 || skip
+aux have_raid 1 13 2 || skip
+
+aux prepare_vg 6
+
+#
+# Test multi step raid5 -> raid10 conversion
+#
+
+# Create raid5(_ls) LV
+lvcreate -y --type raid5 -i 3 -L 16M -R 256K -n $lv1 $vg
+check lv_field $vg/$lv1 segtype "raid5"
+check lv_field $vg/$lv1 stripes 4
+check lv_field $vg/$lv1 data_stripes 3
+check lv_field $vg/$lv1 region_size "256.00k"
+echo y|mkfs -t ext4 $DM_DEV_DIR/$vg/$lv1
+fsck -fn $DM_DEV_DIR/$vg/$lv1
+aux wait_for_sync $vg $lv1
+fsck -fn $DM_DEV_DIR/$vg/$lv1
+
+# Convert raid5 -> raid10 (first step raid5 -> raid5_n)
+lvconvert -y --ty raid10 $vg/$lv1
+fsck -fn $DM_DEV_DIR/$vg/$lv1
+check lv_field $vg/$lv1 segtype "raid5_n"
+check lv_field $vg/$lv1 stripes 4
+check lv_field $vg/$lv1 data_stripes 3
+check lv_field $vg/$lv1 region_size "256.00k"
+aux wait_for_sync $vg $lv1
+fsck -fn $DM_DEV_DIR/$vg/$lv1
+
+# Convert raid5 -> raid10 (second step raid5_n -> raid0_meta)
+lvconvert -y --ty raid10 $vg/$lv1
+check lv_field $vg/$lv1 segtype "raid0_meta"
+check lv_field $vg/$lv1 stripes 3
+check lv_field $vg/$lv1 data_stripes 3
+fsck -fn $DM_DEV_DIR/$vg/$lv1
+
+# Convert raid5 -> raid10 (third + last step raid0_meta -> raid10)
+lvconvert -y --ty raid10 -R 256K $vg/$lv1
+fsck -fn $DM_DEV_DIR/$vg/$lv1
+check lv_field $vg/$lv1 segtype "raid10"
+check lv_field $vg/$lv1 stripes 6
+check lv_field $vg/$lv1 data_stripes 3
+check lv_field $vg/$lv1 region_size "256.00k"
+
+vgremove -ff $vg