From ce1e5b99915cf45530e25628f02537136045c938 Mon Sep 17 00:00:00 2001 From: Heinz Mauelshagen Date: Tue, 28 Feb 2017 22:46:25 +0100 Subject: [PATCH] lvconvert: adjust reshaping check to target version https://git.kernel.org/cgit/linux/kernel/git/device-mapper/linux-dm.git/commit/?h=dm-4.11&id=b08c6076782 sets the dm-raid target version to 1.10.1. Adjust the condition to set RAID_RESHAPE_FEATURE to it. Related: rhbz834579 Related: rhbz1191935 Related: rhbz1191978 --- lib/metadata/segtype.h | 2 +- lib/raid/raid.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/metadata/segtype.h b/lib/metadata/segtype.h index bea714189..a7a38577c 100644 --- a/lib/metadata/segtype.h +++ b/lib/metadata/segtype.h @@ -286,7 +286,7 @@ struct segment_type *init_unknown_segtype(struct cmd_context *cmd, #define RAID_FEATURE_RAID0 (1U << 1) /* version 1.7 */ #define RAID_FEATURE_RESHAPING (1U << 2) /* version 1.8 */ #define RAID_FEATURE_RAID4 (1U << 3) /* ! version 1.8 or 1.9.0 */ -#define RAID_FEATURE_RESHAPE (1U << 4) /* version 1.10.2 */ +#define RAID_FEATURE_RESHAPE (1U << 4) /* version 1.10.1 */ #ifdef RAID_INTERNAL int init_raid_segtypes(struct cmd_context *cmd, struct segtype_library *seglib); diff --git a/lib/raid/raid.c b/lib/raid/raid.c index 9ab2e6c6f..68154540e 100644 --- a/lib/raid/raid.c +++ b/lib/raid/raid.c @@ -496,7 +496,7 @@ static int _raid_target_present(struct cmd_context *cmd, SEG_TYPE_NAME_RAID4); if (maj > 1 || - (maj == 1 && (min > 10 || (min == 10 && patchlevel >= 2)))) + (maj == 1 && (min > 10 || (min == 10 && patchlevel >= 1)))) _raid_attrs |= RAID_FEATURE_RESHAPE; }