From 772e86b842a65d789876fd29e929e8c68585e37f Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Fri, 3 Dec 2021 10:23:04 +0100 Subject: [PATCH 279/310] geli: Include sizes when the media size doesn't match ... the one of the backup file that is supposed to be restored. Use casts to make sure this compiles on both amd64 and i386. Obtained from: ElectroBSD --- lib/geom/eli/geom_eli.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/geom/eli/geom_eli.c b/lib/geom/eli/geom_eli.c index 7e6e6a360387..1de864257132 100644 --- a/lib/geom/eli/geom_eli.c +++ b/lib/geom/eli/geom_eli.c @@ -1801,8 +1801,11 @@ eli_restore(struct gctl_req *req) if (gctl_get_int(req, "force")) { md.md_provsize = mediasize; } else { - gctl_error(req, "Provider size mismatch: " - "wrong backup file?"); + gctl_error(req, "Provider size mismatch for %s. " + "Provider size %llu, media size %llu. " + "Wrong backup file?", + prov, (unsigned long long)md.md_provsize, + (unsigned long long)mediasize); return; } } -- 2.37.1