From 14ffc9d4df952346ce4338939b3ed869b8b491b4 Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Wed, 28 Aug 2013 14:11:59 +0200 Subject: [PATCH] reporter: Adapt pvseg reporting to label-type fields. --- lib/report/report.c | 11 ++++++++--- tools/reporter.c | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/report/report.c b/lib/report/report.c index 9fd75bb7f..e4ad2c321 100644 --- a/lib/report/report.c +++ b/lib/report/report.c @@ -727,10 +727,15 @@ static int _pvuuid_disp(struct dm_report *rh __attribute__((unused)), struct dm_ const struct label *label = (const struct label *) data; char *repstr = NULL; - if (!(repstr = id_format_and_copy(mem, label->dev->pvid))) - return_0; + if (!label->dev) + dm_report_field_set_value(field, "", NULL); + else { + if (!(repstr = id_format_and_copy(mem, label->dev->pvid))) + return_0; + + dm_report_field_set_value(field, repstr, NULL); + } - dm_report_field_set_value(field, repstr, NULL); return 1; } diff --git a/tools/reporter.c b/tools/reporter.c index 28e178c46..fb01686d9 100644 --- a/tools/reporter.c +++ b/tools/reporter.c @@ -107,7 +107,7 @@ static int _pvsegs_sub_single(struct cmd_context *cmd, dm_list_init(&_free_logical_volume.snapshot_segs); if (!report_object(handle, vg, seg ? seg->lv : &_free_logical_volume, pvseg->pv, - seg ? : &_free_lv_segment, pvseg, NULL)) { + seg ? : &_free_lv_segment, pvseg, pv_label(pvseg->pv))) { ret = ECMD_FAILED; goto_out; }