Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Aug 2025 15:58:21 GMT
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 61288a578511 - main - zdb: Fix the 32-bit build
Message-ID:  <202508211558.57LFwLx3062758@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=61288a5785115ea15556f60bd04d9026f47eb43a

commit 61288a5785115ea15556f60bd04d9026f47eb43a
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2025-08-21 15:33:25 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2025-08-21 15:56:23 +0000

    zdb: Fix the 32-bit build
---
 sys/contrib/openzfs/cmd/zdb/zdb.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/contrib/openzfs/cmd/zdb/zdb.c b/sys/contrib/openzfs/cmd/zdb/zdb.c
index 957e6c67dd12..a5f23be2aaaf 100644
--- a/sys/contrib/openzfs/cmd/zdb/zdb.c
+++ b/sys/contrib/openzfs/cmd/zdb/zdb.c
@@ -2627,8 +2627,8 @@ print_indirect(spa_t *spa, blkptr_t *bp, const zbookmark_phys_t *zb,
 		}
 		if (BP_GET_LEVEL(bp) != zb->zb_level) {
 			(void) printf(" (ERROR: Block pointer level "
-			    "(%llu) does not match bookmark level (%ld))",
-			    BP_GET_LEVEL(bp), zb->zb_level);
+			    "(%llu) does not match bookmark level (%lld))",
+			    BP_GET_LEVEL(bp), (u_longlong_t)zb->zb_level);
 			corruption_found = B_TRUE;
 		}
 	}
@@ -2681,8 +2681,8 @@ visit_indirect(spa_t *spa, const dnode_phys_t *dnp,
 			if (fill != BP_GET_FILL(bp)) {
 				(void) printf("%16llx: Block pointer "
 				    "fill (%llu) does not match calculated "
-				    "value (%lu)\n", offset, BP_GET_FILL(bp),
-				    fill);
+				    "value (%llu)\n", offset, BP_GET_FILL(bp),
+				    (u_longlong_t)fill);
 				corruption_found = B_TRUE;
 			}
 		}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202508211558.57LFwLx3062758>