From nobody Wed Nov 29 15:57:08 2023 X-Original-To: dev-commits-src-all@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 4SgP8j0hw9z52tVm; Wed, 29 Nov 2023 15:57:09 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgP8j0BhKz4cn4; Wed, 29 Nov 2023 15:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701273429; 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=skV7g82UMOcx85mqD/upO/ptSm85WB523xHWwdPhsMw=; b=MEjarod2EZlv8kpp1qQUaA3EAeCRQgeeTBbYgsSL8yXv1yMeXUocJwIqItFReI37aQHZEX ANPjGsdt5pSNGHLZtuxT1SjBNRWw+l2gtDP18XBmFmGpxvBKylBf2SNOHlYxbXEBP1sWvU +O++VWZ66CjXrPMSvF8X+JEOhMYDkN+nQjRHLwRcHyF5dOntJVo4MYvOMeZTxZhNo8zCEb RGy3X2Snsd+MGxx9Mt1ntCjDvtFT7MSaDkiz8DvwQ/q+LJIfQ6c++uNoQnmvB4pSaRmc0J Eot7bF/Ln2ktb8xANETMJnnn4nYeSV7ucENJV1NbGt/g/fAf2cBXbi6jvfmDXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701273429; 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=skV7g82UMOcx85mqD/upO/ptSm85WB523xHWwdPhsMw=; b=sd8YdYnTSA1eK2qqq+303YDS3+SruPrQGVs3V58YuCKmRR7K8dNm6jBcNbNmnP4BCzkzdM nRpoC0CviH0bqm3E4Pw9DzPuvd+KL50eJoLKU6FlWolfxBApONYVJgR1OaDdjtFae07c63 20nRMJ9f2kBYphNue92cTR2qDXMNwVw0IibCYWnu2C6oiBFi2oHKxihYCjMdzymG1gArdS CKgbAXYjHp1+9NU17tLtLgOrtqyxzihbRxXKAenyJTXp+S7963n94SeyYRDjjRulEboLz4 TKeA+t/Q3uVRM2De2GhDzY2JFwtAkx58ha/VgJ94W4HmI81rYNus43XIBZP5RQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701273429; a=rsa-sha256; cv=none; b=eU+5vMtJdNecD4e0hxHIHHYOIL9Fd38Vtkmzzch+s7Gi4xAuTtDa7JCq/QiVEI3uDBFMJY qS1yGM77k+0JqBAhUOqFF9UJdjkV94R3tb+B8Uv78b4ZwTxl3FUSBMx82srbyVM2IhLns8 LsUr4Wp4DjdOC+W4ZWdLD+TVROhrcC6SQvEHAeE2iQNW9kEqDYB13LxETXHvaDGDuPXPPI EmsXV7/Q1iepRmjaWYMS3IQ/7Nfjd7RlU5/RdOIZLrsJgd1Gp7JjlX375qkGBvm7HWTN1o QQTYSYAucOUxwZrwXp1OJefEYbQw23jCn/uUJC0W41ULkpmnwZwkRYb0aeawVA== 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 4SgP8h6Mttz1BYP; Wed, 29 Nov 2023 15:57:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATFv8GD076228; Wed, 29 Nov 2023 15:57:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATFv85t076225; Wed, 29 Nov 2023 15:57:08 GMT (envelope-from git) Date: Wed, 29 Nov 2023 15:57:08 GMT Message-Id: <202311291557.3ATFv85t076225@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: db0a4f2d7a65 - main - openzfs: unbreak 32-bit builds. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db0a4f2d7a654250f329241c6bd3f535be9a05bc Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=db0a4f2d7a654250f329241c6bd3f535be9a05bc commit db0a4f2d7a654250f329241c6bd3f535be9a05bc Author: Warner Losh AuthorDate: 2023-11-29 15:26:29 +0000 Commit: Warner Losh 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); }