diff options
| -rw-r--r-- | lib/report/report.c | 1 | ||||
| -rw-r--r-- | lib/report/report.h | 7 | ||||
| -rw-r--r-- | tools/reporter.c | 8 |
3 files changed, 6 insertions, 10 deletions
diff --git a/lib/report/report.c b/lib/report/report.c index 5009ecc80..08a609792 100644 --- a/lib/report/report.c +++ b/lib/report/report.c @@ -3667,7 +3667,6 @@ static const struct dm_report_object_type _report_types[] = { { PVS, "Physical Volume", "pv_", _obj_get_pv }, { LABEL, "Physical Volume Label", "pv_", _obj_get_label }, { SEGS, "Logical Volume Segment", "seg_", _obj_get_seg }, - { SEGSSTATUS, "Logical Volume Device Segment Status", "seg_", _obj_get_lv_with_info_and_seg_status }, { PVSEGS, "Physical Volume Segment", "pvseg_", _obj_get_pvseg }, { 0, "", "", NULL }, }; diff --git a/lib/report/report.h b/lib/report/report.h index 182f29497..088a1ca48 100644 --- a/lib/report/report.h +++ b/lib/report/report.h @@ -28,10 +28,9 @@ typedef enum { PVS = 16, VGS = 32, SEGS = 64, - SEGSSTATUS = 128, - PVSEGS = 256, - LABEL = 512, - DEVTYPES = 1024 + PVSEGS = 128, + LABEL = 256, + DEVTYPES = 512 } report_type_t; /* diff --git a/tools/reporter.c b/tools/reporter.c index 220e307ce..a4cae6032 100644 --- a/tools/reporter.c +++ b/tools/reporter.c @@ -409,10 +409,10 @@ static int _get_final_report_type(int args_are_pvs, *lv_info_needed = (report_type & (LVSINFO | LVSINFOSTATUS)) ? 1 : 0; /* Do we need to acquire LV device status in addition? */ - *lv_segment_status_needed = (report_type & (SEGSSTATUS | LVSSTATUS | LVSINFOSTATUS)) ? 1 : 0; + *lv_segment_status_needed = (report_type & (LVSSTATUS | LVSINFOSTATUS)) ? 1 : 0; /* Ensure options selected are compatible */ - if (report_type & (SEGS | SEGSSTATUS)) + if (report_type & SEGS) report_type |= LVS; if (report_type & PVSEGS) report_type |= PVS; @@ -429,7 +429,7 @@ static int _get_final_report_type(int args_are_pvs, else if ((report_type & PVS) || ((report_type & LABEL) && (report_type & VGS))) report_type = PVS; - else if (report_type & (SEGS | SEGSSTATUS)) + else if (report_type & SEGS) report_type = SEGS; else if (report_type & (LVS | LVSINFO | LVSSTATUS | LVSINFOSTATUS)) report_type = LVS; @@ -907,8 +907,6 @@ static int _report(struct cmd_context *cmd, int argc, char **argv, r = process_each_vg(cmd, argc, argv, NULL, 0, handle, &_pvs_in_vg); break; - case SEGSSTATUS: - /* fall through */ case SEGS: r = process_each_lv(cmd, argc, argv, 0, handle, lv_info_needed && !lv_segment_status_needed ? &_lvsegs_with_info_single : |