summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2021-01-19 11:21:20 -0600
committerDavid Teigland <teigland@redhat.com>2021-01-19 11:21:20 -0600
commit74adbec77f77cd725bbac7ab3f3fb964d8b1e1f0 (patch)
tree9011a1d2656e591a8f1e62b1abbb3ae3a324a37f
parent2ec29d0677a5f92728873b5b1e303478cd71a3e4 (diff)
downloadlvm2-74adbec77f77cd725bbac7ab3f3fb964d8b1e1f0.tar.gz
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.
-rw-r--r--tools/pvck.c10
1 files 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);