The branch main has been updated by imp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=db0a4f2d7a654250f329241c6bd3f535be9a05bc
commit db0a4f2d7a654250f329241c6bd3f535be9a05bc
Author: Warner Losh <i...@freebsd.org>
AuthorDate: 2023-11-29 15:26:29 +0000
Commit: Warner Losh <i...@freebsd.org>
CommitDate: 2023-11-29 15:26:29 +0000
openzfs: unbreak 32-bit builds.
32-bit builds are broken. fix that by using PRIu64 instead of a
bare '%lu.'
Feel free to revert when upstream has this fixed. I'm agnostic as to the
proper fix, but don't have the time to fight upstreaming this on top of
everything else.
---
sys/contrib/openzfs/cmd/zdb/zdb.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys/contrib/openzfs/cmd/zdb/zdb.c
b/sys/contrib/openzfs/cmd/zdb/zdb.c
index 486bec9910a4..777032bf82f6 100644
--- a/sys/contrib/openzfs/cmd/zdb/zdb.c
+++ b/sys/contrib/openzfs/cmd/zdb/zdb.c
@@ -2126,14 +2126,14 @@ dump_brt(spa_t *spa)
continue;
if (!brtvd->bv_initiated) {
- printf("BRT: vdev %lu: empty\n", vdevid);
+ printf("BRT: vdev %" PRIu64 ": empty\n", vdevid);
continue;
}
zdb_nicenum(brtvd->bv_totalcount, count, sizeof (count));
zdb_nicebytes(brtvd->bv_usedspace, used, sizeof (used));
zdb_nicebytes(brtvd->bv_savedspace, saved, sizeof (saved));
- printf("BRT: vdev %lu: refcnt %s; used %s; saved %s\n",
+ printf("BRT: vdev %" PRIu64 ": refcnt %s; used %s; saved %s\n",
vdevid, count, used, saved);
}
@@ -2156,7 +2156,7 @@ dump_brt(spa_t *spa)
uint64_t offset = *(uint64_t *)za.za_name;
uint64_t refcnt = za.za_first_integer;
- snprintf(dva, sizeof (dva), "%lu:%llx", vdevid,
+ snprintf(dva, sizeof (dva), "%" PRIu64 ":%llx", vdevid,
(u_longlong_t)offset);
printf("%-16s %-10llu\n", dva, (u_longlong_t)refcnt);
}
