report: Convert pv_mda_size to a type "label" field.

diff --git a/lib/report/columns.h b/lib/report/columns.h
index 06176052836bec2ee50c524bdfe910ef3bf738ca..93b5575b282a9d23bd8351bf5f4ab407dcf36949 100644 (file)
--- a/lib/report/columns.h
+++ b/lib/report/columns.h
@@ -71,7 +71,7 @@ FIELD(LABEL, label, STR, "PV UUID", type, 38, pvuuid, pv_uuid, "Unique identifie
 FIELD(LABEL, label, NUM, "DevSize", dev, 7, devsize, dev_size, "Size of underlying device in current units.", 0)
 FIELD(LABEL, label, STR, "PV", dev, 10, dev_name, pv_name, "Name.", 0)
 FIELD(LABEL, label, NUM, "PMdaFree", type, 9, pvmdafree, pv_mda_free, "Free metadata area space on this device in current units.", 0)
-FIELD(LABEL, pv, NUM, "PMdaSize", id, 9, pvmdasize, pv_mda_size, "Size of smallest metadata area on this device in current units.", 0)
+FIELD(LABEL, label, NUM, "PMdaSize", type, 9, pvmdasize, pv_mda_size, "Size of smallest metadata area on this device in current units.", 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, NUM, "PSize", id, 5, pvsize, pv_size, "Size of PV in current units.", 0)

diff --git a/lib/report/report.c b/lib/report/report.c
index e4ad2c3217219a4c2ed6a369264f3a07a6b398b6..9cb22989f76c7de29be7c84b929d68385b13ea29 100644 (file)
--- a/lib/report/report.c
+++ b/lib/report/report.c
@@ -820,9 +820,8 @@ static int _pvmdasize_disp(struct dm_report *rh, struct dm_pool *mem,
                           struct dm_report_field *field,
                           const void *data, void *private)
 {
-       const struct physical_volume *pv =
-           (const struct physical_volume *) data;
-       uint64_t min_mda_size = pv_mda_size(pv);
+       const struct label *label = (const struct label *) data;
+       uint64_t min_mda_size = lvmcache_smallest_mda_size(label->info);
 
        return _size64_disp(rh, mem, field, &min_mda_size, private);
 }

diff --git a/test/shell/pvcreate-usage.sh b/test/shell/pvcreate-usage.sh
index c78e4bda822649014cc34b934cc2b087c94b8904..251746dcb78c4b454690c0351270c896ed2a5d32 100644 (file)
--- a/test/shell/pvcreate-usage.sh
+++ b/test/shell/pvcreate-usage.sh
@@ -34,6 +34,7 @@ pvremove "$dev1"
 pvcreate --metadatasize 512k "$dev1"
 pvcreate --metadatasize 96k "$dev2"
 vgcreate $vg "$dev1" "$dev2"
+pvs -o +pv_mda_size
 check compare_fields vgs $vg vg_mda_size pvs "$dev2" pv_mda_size
 vgremove $vg