diff --git a/WHATS_NEW b/WHATS_NEW index 043b19b49..c73fe24f3 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.87 - =============================== + Remove INCONSISTENT_VG flag from the code. Remove lock from cache even if unlock fails. Initialise clvmd locks before lvm context to avoid open descriptor leaks. Remove obsoleted GULM clvmd cluster locking support. diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index c8442d848..215d1f493 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -2861,12 +2861,8 @@ static struct volume_group *_vg_read(struct cmd_context *cmd, * the missing PV logic below. */ if ((correct_vg = lvmcache_get_vg(vgid, precommitted)) && - (use_precommitted || !*consistent || !(correct_vg->status & INCONSISTENT_VG))) { - if (!(correct_vg->status & INCONSISTENT_VG)) - *consistent = 1; - else /* Inconsistent but we can't repair it */ - correct_vg->status &= ~INCONSISTENT_VG; - + (use_precommitted || !*consistent)) { + *consistent = 1; return correct_vg; } else { free_vg(correct_vg); @@ -3131,8 +3127,7 @@ static struct volume_group *_vg_read(struct cmd_context *cmd, * If there is no precommitted metadata, committed metadata * is read and stored in the cache even if use_precommitted is set */ - lvmcache_update_vg(correct_vg, correct_vg->status & PRECOMMITTED & - (inconsistent ? INCONSISTENT_VG : 0)); + lvmcache_update_vg(correct_vg, (correct_vg->status & PRECOMMITTED)); if (inconsistent) { /* FIXME Test should be if we're *using* precommitted metadata not if we were searching for it */ diff --git a/lib/metadata/metadata.h b/lib/metadata/metadata.h index 4c8ca3ed0..9b85cfba8 100644 --- a/lib/metadata/metadata.h +++ b/lib/metadata/metadata.h @@ -75,7 +75,6 @@ //#define CONVERTING 0x00400000U /* LV */ //#define MISSING_PV 0x00800000U /* PV */ -#define INCONSISTENT_VG 0x00800000U /* VG - internal use only */ //#define PARTIAL_LV 0x01000000U /* LV - derived flag, not // written out in metadata*/