From nobody Thu Aug 21 15:58:21 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c77Jt3TDRz65Kr1; Thu, 21 Aug 2025 15:58:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c77Js4RXPz3LlS; Thu, 21 Aug 2025 15:58:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755791901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mgUubpkdiW/vUme7oRMQyRDA4HB6gir/TgeTCXw/fZA=; b=uNSAgaFDT/1Ax9Fn9Q25nvyzHGzpfmRLA6wNtrBYnvNVn3tTz18tZdjv9g9aPLrBrCId5A PkLpji3HnnmRTyakzyUHteSAAc3z7kTL3j73mUmPAw8SYCYmvnuigGTutJ43LMBLFvrPcZ gT6ykx1Dh+e6XvvpiRU29E+Y0POYs4UnQbqyCBzZhY1qVi8nFcflEo3IHsAAJoehltbkts rrCmi842Dm+lolXP4TJfIPorWOcjHQG7f9xdBtFDn1vsdtl3K+YRTmqBGpi/p3xQ8QW4zs TaczHv6AYNaO26bYgLA+yRv3a0bio55ml5qkh7rCw0RNhMYzKd+ScOlzRiCfwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755791901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mgUubpkdiW/vUme7oRMQyRDA4HB6gir/TgeTCXw/fZA=; b=itd/4ZPvP0L0Wu5hLwOuPFn0UG39TzUOVaoa7J5Pr29naj02LhCjGe1OnEIWyHGbVVwt/q g/y/E66Atag3HnDNfD8uGn1JkeqlRqXDFaUrc9SOPX5fX9EBGFHCA1RlUZys+1rJ/Jf3FC Z1NBRzTQ2tFUA66h8lg7F2HnDQ89E4jNNUUcftiOkyxlz4VZxJMMtKyi7ZUGj4f+ol33dG 1E2H4PTHA8e/mHOqQ2IKe6QWf4nPXVvTdaeLhynu4+UognMOarmttL9c0pYgFsJktrMpW7 ZwUr2MEZF8gWWFP1pHEm/mIhincVkUfmk3npK50g59LKRTpO166+PcCaoMWtlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755791901; a=rsa-sha256; cv=none; b=thnSa6/CQu3c3wdM8nwhDbKncqWMRiNa7vIp5DR3pJnWmKB+MCcM1Rc8LGN/se4MrWHSa1 B68KkPX0T/xxgE+rh1C9GJiNfQWracuu78noh9Yyn0E0lprMFWwSI4BkIYfcHgejSrchg2 yajq3x1F4OHOQ3wd9mvzc9lS0ku79CW7KS6Y+ckRRl3lNbD6PUtBWDoYNNiLHc84i8jHm3 TSlMAwLU0jYPsN/yS87L++P8nINi1tNnr+s7aia7RcpLQgHPLwwRme/vd73TJbjoARQ6Yd 2qKTATr726RSWx78QbUbFtJvwS18T6BTScPaZS1wy2wU5jxN7YMvN5Hlenv5pA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c77Js3PgGz15W6; Thu, 21 Aug 2025 15:58:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57LFwLxF062761; Thu, 21 Aug 2025 15:58:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LFwLx3062758; Thu, 21 Aug 2025 15:58:21 GMT (envelope-from git) Date: Thu, 21 Aug 2025 15:58:21 GMT Message-Id: <202508211558.57LFwLx3062758@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 61288a578511 - main - zdb: Fix the 32-bit build List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 61288a5785115ea15556f60bd04d9026f47eb43a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=61288a5785115ea15556f60bd04d9026f47eb43a commit 61288a5785115ea15556f60bd04d9026f47eb43a Author: Mark Johnston AuthorDate: 2025-08-21 15:33:25 +0000 Commit: Mark Johnston 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; } }