From 969f4aa02f61c1b4b8d38d11d4bd957577428bba Mon Sep 17 00:00:00 2001 From: wguanghao Date: Wed, 26 Jan 2022 19:54:41 +0800 Subject: [PATCH] pvck: fix warning and exit code for non-4k mda1 offset --- ...-and-exit-code-for-non-4k-mda1-offse.patch | 35 +++++++++++++++++++ lvm2.spec | 6 +++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 0015-pvck-fix-warning-and-exit-code-for-non-4k-mda1-offse.patch diff --git a/0015-pvck-fix-warning-and-exit-code-for-non-4k-mda1-offse.patch b/0015-pvck-fix-warning-and-exit-code-for-non-4k-mda1-offse.patch new file mode 100644 index 0000000..7522d98 --- /dev/null +++ b/0015-pvck-fix-warning-and-exit-code-for-non-4k-mda1-offse.patch @@ -0,0 +1,35 @@ +From 74adbec77f77cd725bbac7ab3f3fb964d8b1e1f0 Mon Sep 17 00:00:00 2001 +From: David Teigland +Date: Tue, 19 Jan 2021 11:21:20 -0600 +Subject: [PATCH] pvck: fix warning and exit code for non-4k mda1 offset + +Print a warning if mda1 is not 4k, 8k or 64k. +Don't exit with an error for any unexpected mda1 offset. +--- + tools/pvck.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/tools/pvck.c b/tools/pvck.c +index c36e18216..88350de8c 100644 +--- a/tools/pvck.c ++++ b/tools/pvck.c +@@ -1140,9 +1140,13 @@ static int _dump_label_and_pv_header(struct cmd_context *cmd, uint64_t labelsect + *mda1_offset = xlate64(dlocn->offset); + *mda1_size = xlate64(dlocn->size); + +- if (*mda1_offset != 4096) { +- log_print("CHECK: pv_header.disk_locn[%d].offset expected 4096 # for first mda", di); +- bad++; ++ /* ++ * mda1 offset is page size from machine that created it, ++ * warn if it's not one of the expected page sizes. ++ */ ++ if ((*mda1_offset != 4096) && (*mda1_offset != 8192) && (*mda1_offset != 65536)) { ++ log_print("WARNING: pv_header.disk_locn[%d].offset %llu is unexpected # for first mda", ++ di, (unsigned long long)*mda1_offset); + } + } else { + *mda2_offset = xlate64(dlocn->offset); +-- +2.25.1 + diff --git a/lvm2.spec b/lvm2.spec index 6b87ed0..9fe3bcd 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -43,7 +43,7 @@ Name: lvm2 Version: 2.03.11 -Release: 5 +Release: 6 Epoch: 8 Summary: Tools for logical volume management License: GPLv2+ and LGPLv2.1 and BSD @@ -63,6 +63,7 @@ Patch11: 0011-enhancement-log-it-when-disk-slow.patch Patch12: 0012-bugfix-lvm2-fix-the-reuse-of-va_list.patch Patch13: 0013-lvreduce-support-yes.patch Patch14: 0014-unit-test-modify-for-systems-with-PGSIZE-of-64K.patch +Patch15: 0015-pvck-fix-warning-and-exit-code-for-non-4k-mda1-offse.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -487,6 +488,9 @@ fi %changelog +* Wed Jan 26 2022 wuguanghao - 8.2.03.11-6 +- fix pvck warning and exit code for pagesize not 4k + * Wed Jul 28 2021 wuguanghao - 8.2.03.11-5 - %check modified to make run-unit-test -- Gitee