diff options
| author | Petr Rockai <prockai@redhat.com> | 2013-07-29 16:00:40 +0200 |
|---|---|---|
| committer | Petr Rockai <prockai@redhat.com> | 2013-07-29 19:16:27 +0200 |
| commit | 6d50e8f2f63fd6d0db3dacfed825d96ae8be5d22 (patch) | |
| tree | 9dbcbf8a99f45d9127b0d9f409d527098e7c0cfb | |
| parent | 9ac7e25cd1d914ea6264a31afcb9f105e0f9062a (diff) | |
| download | lvm2-6d50e8f2f63fd6d0db3dacfed825d96ae8be5d22.tar.gz | |
report: Adapt _pvfmt_disp to label-based reporting.
| -rw-r--r-- | lib/report/columns.h | 2 | ||||
| -rw-r--r-- | lib/report/report.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/report/columns.h b/lib/report/columns.h index 0da3e70fa..bbf48323d 100644 --- a/lib/report/columns.h +++ b/lib/report/columns.h @@ -66,9 +66,9 @@ FIELD(LVS, lv, STR, "Time", lvid, 26, lvtime, lv_time, "Creation time of the LV, FIELD(LVS, lv, STR, "Host", lvid, 10, lvhost, lv_host, "Creation host of the LV, if known.", 0) FIELD(LVS, lv, STR, "Modules", lvid, 7, modules, lv_modules, "Kernel device-mapper modules required for this LV.", 0) -FIELD(LABEL, pv, STR, "Fmt", id, 3, pvfmt, pv_fmt, "Type of metadata.", 0) FIELD(LABEL, pv, STR, "PV UUID", id, 38, uuid, pv_uuid, "Unique identifier.", 0) FIELD(LABEL, pv, NUM, "PMdaFree", id, 9, pvmdafree, pv_mda_free, "Free metadata area space on this device in current units.", 0) +FIELD(LABEL, label, STR, "Fmt", type, 3, pvfmt, pv_fmt, "Type of metadata.", 0) 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, pv, NUM, "PMdaSize", id, 9, pvmdasize, pv_mda_size, "Size of smallest metadata area on this device in current units.", 0) diff --git a/lib/report/report.c b/lib/report/report.c index 912bcdef7..e024d0201 100644 --- a/lib/report/report.c +++ b/lib/report/report.c @@ -143,15 +143,15 @@ static int _pvfmt_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; + const struct label *l = + (const struct label *) data; - if (!pv->fmt) { + if (!l->labeller->fmt) { dm_report_field_set_value(field, "", NULL); return 1; } - return _string_disp(rh, mem, field, &pv->fmt->name, private); + return _string_disp(rh, mem, field, &l->labeller->fmt->name, private); } static int _lvkmaj_disp(struct dm_report *rh, struct dm_pool *mem __attribute__((unused)), |