commands: recognize raid variations

diff --git a/tools/lv_types.h b/tools/lv_types.h
index 22d05225c6c400f4debe0345b9a90674460620b7..bd4666ed4d29b0f09e139380563910964111e740 100644 (file)
--- a/tools/lv_types.h
+++ b/tools/lv_types.h
@@ -21,7 +21,7 @@ lvt(thinpool_LVT, "thinpool", NULL)
 lvt(cache_LVT, "cache", NULL)
 lvt(cachepool_LVT, "cachepool", NULL)
 lvt(mirror_LVT, "mirror", NULL)
-lvt(raid_LVT, "raid", NULL)
+lvt(raid_LVT, "raid", NULL) /* any raid type */
 lvt(raid0_LVT, "raid0", NULL)
 lvt(raid1_LVT, "raid1", NULL)
 lvt(raid4_LVT, "raid4", NULL)

diff --git a/tools/toollib.c b/tools/toollib.c
index 3b479894b23d8a965b242a186c2d92dbec132c3e..a539878c8f6b460e1bd16c351087cc2a0ae16f9b 100644 (file)
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -2515,17 +2515,15 @@ static int _lv_is_type(struct cmd_context *cmd, struct logical_volume *lv, int l
        case raid_LVT:
                return lv_is_raid(lv);
        case raid0_LVT:
-               return seg_is_raid0(seg);
+               return seg_is_any_raid0(seg);
        case raid1_LVT:
                return seg_is_raid1(seg);
        case raid4_LVT:
                return seg_is_raid4(seg);
-#if 0
        case raid5_LVT:
-               return seg_is_raid5(seg);
+               return seg_is_any_raid5(seg);
        case raid6_LVT:
-               return seg_is_raid6(seg);
-#endif
+               return seg_is_any_raid6(seg);
        case raid10_LVT:
                return seg_is_raid10(seg);
        case error_LVT:
@@ -2566,18 +2564,16 @@ int get_lvt_enum(struct logical_volume *lv)
                return mirror_LVT;
        if (lv_is_raid(lv))
                return raid_LVT;
-       if (seg_is_raid0(seg))
+       if (seg_is_any_raid0(seg))
                return raid0_LVT;
        if (seg_is_raid1(seg))
                return raid1_LVT;
        if (seg_is_raid4(seg))
                return raid4_LVT;
-#if 0
-       if (seg_is_raid5(seg))
+       if (seg_is_any_raid5(seg))
                return raid5_LVT;
-       if (seg_is_raid6(seg))
+       if (seg_is_any_raid6(seg))
                return raid6_LVT;
-#endif
        if (seg_is_raid10(seg))
                return raid10_LVT;