[lvm2-commits] dev-prajnoha-pv-ext-flag-used - report: add pv_ext_vsn field to display PV header extension version used

[Peter Rajnoha]

Gitweb:       
http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=12752adfa9fe86...
Commit:        12752adfa9fe864cd32a43c0f5f43886c3f58588
Parent:        95fbbca4f1be486bb05cd99bd5d71f61dbd06015
Author:        Peter Rajnoha <prajnoha(a)redhat.com&gt;
AuthorDate:    Tue Mar 17 09:49:08 2015 +0100
Committer:     Peter Rajnoha <prajnoha(a)redhat.com&gt;
CommitterDate: Fri Aug 21 11:15:53 2015 +0200

report: add pv_ext_vsn field  to display PV header extension version used

For example:

$ pvs -o pv_name,vg_name,pv_ext_vsn,pv_in_use
  PV         VG     ExtVsn InUse
  /dev/sda               2
  /dev/sdb   vg          2    used
  /dev/vda2  fedora      1 unknown
---
 lib/report/columns.h    |    3 ++-
 lib/report/properties.c |    2 ++
 lib/report/report.c     |   16 ++++++++++++++++
 3 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/lib/report/columns.h b/lib/report/columns.h
index b29a93b..98f637c 100644
--- a/lib/report/columns.h
+++ b/lib/report/columns.h
@@ -113,7 +113,8 @@ FIELD(LABEL, label, SIZ, "DevSize", dev, 7, devsize,
dev_size, "Size of underlyi
 FIELD(LABEL, label, STR, "PV", dev, 10, dev_name, pv_name, "Name.",
0)
 FIELD(LABEL, label, SIZ, "PMdaFree", type, 9, pvmdafree, pv_mda_free,
"Free metadata area space on this device in current units.", 0)
 FIELD(LABEL, label, SIZ, "PMdaSize", type, 9, pvmdasize, pv_mda_size,
"Size of smallest metadata area on this device in current units.", 0)
-FIELD(LABEL, label, BIN, "PInUse", type, 6, pvinuse, pv_in_use, "Set if PV
is used.", 0)
+FIELD(LABEL, label, NUM, "PExtVsn", type, 7, pvextvsn, pv_ext_vsn, "PV
header extension version.", 0)
+FIELD(LABEL, label, BIN, "PInUse", type, 5, pvinuse, pv_in_use, "Set if PV
is used.", 0)
 
 FIELD(PVS, pv, NUM, "1st PE", pe_start, 7, size64, pe_start, "Offset to
the start of data on the underlying device.", 0)
 FIELD(PVS, pv, SIZ, "PSize", id, 5, pvsize, pv_size, "Size of PV in
current units.", 0)
diff --git a/lib/report/properties.c b/lib/report/properties.c
index 76c7158..b675aaa 100644
--- a/lib/report/properties.c
+++ b/lib/report/properties.c
@@ -190,6 +190,8 @@ GET_PV_NUM_PROPERTY_FN(pv_ba_size, SECTOR_SIZE * pv->ba_size)
 #define _pv_exported_get prop_not_implemented_get
 #define _pv_missing_set prop_not_implemented_set
 #define _pv_missing_get prop_not_implemented_get
+#define _pv_ext_vsn_get prop_not_implemented_get
+#define _pv_ext_vsn_set prop_not_implemented_set
 #define _pv_in_use_get prop_not_implemented_get
 #define _pv_in_use_set prop_not_implemented_set
 
diff --git a/lib/report/report.c b/lib/report/report.c
index 21d2b05..1bc8e16 100644
--- a/lib/report/report.c
+++ b/lib/report/report.c
@@ -2301,6 +2301,22 @@ static int _pvmdasize_disp(struct dm_report *rh, struct dm_pool
*mem,
 	return _size64_disp(rh, mem, field, &min_mda_size, private);
 }
 
+static int _pvextvsn_disp(struct dm_report *rh, struct dm_pool *mem,
+			  struct dm_report_field *field,
+			  const void *data, void *private)
+{
+	const struct label *label = (const struct label *) data;
+	struct lvmcache_info *info = label->info;
+	uint32_t ext_version;
+
+	if (info) {
+		ext_version = lvmcache_ext_version(info);
+		return _uint32_disp(rh, mem, field, &ext_version, private);
+	}
+
+	return _field_set_value(field, "",
&GET_TYPE_RESERVED_VALUE(num_undef_64));
+}
+
 static int _pvinuse_disp(struct dm_report *rh, struct dm_pool *mem,
 			 struct dm_report_field *field,
 			 const void *data, void *private)