diff --git a/WHATS_NEW b/WHATS_NEW index e76b3d52e..e350b1b01 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.86 - ================================= + Remove unused internal flag ACTIVATE_EXCL from the code. Remove useless test of ACTIVATE_EXCL in lv_add_mirrors() clustered code path. Use lv_activate_opts struct instead of MERGING status flag. Use lv_activate_opts struct instead of ACTIVATE_EXCL status flag. diff --git a/lib/activate/activate.c b/lib/activate/activate.c index bc7d62986..f6d157ae6 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -1293,14 +1293,6 @@ static int _lv_resume(struct cmd_context *cmd, const char *lvid_s, goto out; } - /* - * When targets are activated exclusively in a cluster, the - * non-clustered target should be used. This only happens - * if ACTIVATE_EXCL is set in lv->status. - */ - if (laopts->exclusive) - lv->status |= ACTIVATE_EXCL; - if (!_lv_activate_lv(lv, laopts)) goto_out; diff --git a/lib/format_text/flags.c b/lib/format_text/flags.c index 0af4c89fe..7846ada50 100644 --- a/lib/format_text/flags.c +++ b/lib/format_text/flags.c @@ -62,7 +62,6 @@ static const struct flag _lv_flags[] = { {VIRTUAL, NULL, 0}, {SNAPSHOT, NULL, 0}, {MERGING, NULL, 0}, - {ACTIVATE_EXCL, NULL, 0}, {CONVERTING, NULL, 0}, {PARTIAL_LV, NULL, 0}, {POSTORDER_FLAG, NULL, 0}, diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h index 445fdc490..f1dc194e1 100644 --- a/lib/metadata/metadata-exported.h +++ b/lib/metadata/metadata-exported.h @@ -62,7 +62,6 @@ #define MIRROR_LOG 0x00020000U /* LV */ #define MIRROR_IMAGE 0x00040000U /* LV */ #define LV_NOTSYNCED 0x00080000U /* LV */ -//#define ACTIVATE_EXCL 0x00100000U /* LV - internal use only */ //#define PRECOMMITTED 0x00200000U /* VG - internal use only */ #define CONVERTING 0x00400000U /* LV */ diff --git a/lib/metadata/metadata.h b/lib/metadata/metadata.h index 26941a743..c62bcfb81 100644 --- a/lib/metadata/metadata.h +++ b/lib/metadata/metadata.h @@ -71,7 +71,6 @@ //#define MIRROR_LOG 0x00020000U /* LV */ //#define MIRROR_IMAGE 0x00040000U /* LV */ //#define MIRROR_NOTSYNCED 0x00080000U /* LV */ -#define ACTIVATE_EXCL 0x00100000U /* LV - internal use only */ #define PRECOMMITTED 0x00200000U /* VG - internal use only */ //#define CONVERTING 0x00400000U /* LV */