[lvm2-commits] dev-prajnoha-pv-ext-flag-used - metadata: check for PV extension version before doing any checks on PV extension flags

[Peter Rajnoha]

Gitweb:       
http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=149dfe84901f38...
Commit:        149dfe84901f3825d7576b66279322d35793d5ef
Parent:        e09842e17456628a378db8e22660d487095dbf00
Author:        Peter Rajnoha <prajnoha(a)redhat.com&gt;
AuthorDate:    Mon Mar 16 18:23:43 2015 +0100
Committer:     Peter Rajnoha <prajnoha(a)redhat.com&gt;
CommitterDate: Fri Aug 21 11:15:53 2015 +0200

metadata: check for PV extension version before doing any checks on PV extension flags

PV header extension versions:
  0 - the original PV without any extensions
  1 - bootloader area support added
  2 - PV_EXT_USED flag support added

So do the associated checks related to PV_EXT_USED flag only if
PV header extension found is of version 2 and higher.
---
 lib/metadata/metadata.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index a147d40..8670fd6 100644
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -3314,9 +3314,21 @@ static int _check_or_repair_orphan_pv_ext(struct physical_volume
*pv,
 					  struct lvmcache_info *info,
 					  struct _vg_read_orphan_baton *b)
 {
+	uint32_t ext_version = lvmcache_ext_version(info);
 	uint32_t ext_flags = lvmcache_ext_flags(info);
 	int at_least_one_mda_used;
 
+	/*
+	 * Nothing to do if PV header extension < 2:
+	 *  - version 0 is PV header without any extensions,
+	 *  - version 1 has bootloader area support only and
+	 *    we're not checking anything for that one here.
+	 */
+	if (ext_version < 2) {
+		b->consistent = 1;
+		return 1;
+	}
+
 	if (ext_flags & PV_EXT_USED) {
 		if (lvmcache_mda_count(info)) {
 			at_least_one_mda_used = 0;