From 0e9fe272bcf508cc2e0c99d986a5c95abb2b93d0 Mon Sep 17 00:00:00 2001 From: Peter Rajnoha Date: Mon, 31 Jul 2023 13:37:34 +0200 Subject: [PATCH] report: fix pv_major and pv_minor report field type We incorrectly marked pv_major and pv_minor fields as being of string type, even though the values were already correctly handled as integers internally. This confused -S|--select that tried to compare string values instead of integers. Reported here: https://github.com/lvmteam/lvm2/issues/122 --- WHATS_NEW | 1 + lib/report/columns.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 5d86f0e95..10abe95b1 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ version 2.03.22 - ================================= + Fix pv_major/pv_minor report field types so they are integers, not strings. Always use cachepool name for metadata backup LV for lvconvert --repair. Make metadata backup LVs read-only after pool's lvconvert --repair. Improve VDO and Thin support with lvmlockd. diff --git a/lib/report/columns.h b/lib/report/columns.h index aa3801498..1bb36b9a3 100644 --- a/lib/report/columns.h +++ b/lib/report/columns.h @@ -179,8 +179,8 @@ FIELD(LABEL, label, STR, "Fmt", type, 0, pvfmt, pv_fmt, "Type of metadata.", 0) FIELD(LABEL, label, STR, "PV UUID", type, 38, pvuuid, pv_uuid, "Unique identifier.", 0) FIELD(LABEL, label, SIZ, "DevSize", dev, 0, 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, STR, "Maj", dev, 0, devmajor, pv_major, "Device major number.", 0) -FIELD(LABEL, label, STR, "Min", dev, 0, devminor, pv_minor, "Device minor number.", 0) +FIELD(LABEL, label, SNUM, "Maj", dev, 0, devmajor, pv_major, "Device major number.", 0) +FIELD(LABEL, label, SNUM, "Min", dev, 0, devminor, pv_minor, "Device minor number.", 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, NUM, "PExtVsn", type, 0, pvextvsn, pv_ext_vsn, "PV header extension version.", 0)