From nobody Wed Nov 29 16:00:34 2023 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 4SgPDh0Fv6z52tc8; Wed, 29 Nov 2023 16:00:36 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SgPDg6vlKz4dQ2; Wed, 29 Nov 2023 16:00:35 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701273636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=0vrbJ7rtgrMmq1iWZTqCHST9wE2LRI03Gmznd5t/EcI=; b=g9CaUcsxeuqZRZqnvzISp2MBarbmSbj6qLiCS+79V7WFGv9K+yXcRpl0+3FdnUzxU7f98Q YDNlziR5lHbtVv/qcLi6F1MmC0GB55+MLZmfwl76ZMkQf0ZJj4Pqr8KLOgF5VqtJ9XEP3j hoO+ThsuVdyjX5Ms72xcaHwO5yqV9U6VXC2d/WjAwVd+aC7U+KlfoQ8VBV6XzKmtvxf9gD k0oOQC1yJtSEtb6A5nV9txAhKxHrD5KDNj1p11CuhSRvN5x+8RYPjPYVLoup0NEvlN0Kwk p6nRimJW+ClIwWmYsMNTDBU3x+/1o5ATWRq2Ih76ne7k4K9nHHjEpGvpkAH8OQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701273636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=0vrbJ7rtgrMmq1iWZTqCHST9wE2LRI03Gmznd5t/EcI=; b=kmBmFH6WzwhdbxgmklzI0eU0oaXbkbgIR+28NA1qxWTBr319Fx8kueosTxL6FChtD53yGY VpmdMG5zhCnfXHecp2mgEsigJVfi43FFIosxjXfB4skzg5P0WxxPX4LViRZpR7cYLbLELx Gu3nrL7Bg2aZwbBr78yDj8HebkWIxy6iw2SBZYE5x+n2dh+u0Z6aE1D7UmLvnL/DDj8PpU uHDeB7u4gkg6lNqhN3WDHsFnp2PmVv6hNNaxnrmboQd+sfw1LjoN780FXNGz4oqmSbphJ+ C/HdWi6CBo2Dd7GAjtFEu+tfp7Xpiga4tUiwpwfP8jtvUSpfgxuktq11lnuAsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701273636; a=rsa-sha256; cv=none; b=yfGRNYkSXcKu85fLBx7+weTDedlvH0On1WS2zt6usr8zLCFDmo/jgxLaYyTO3dhWPjbUb/ KgF8Xj8xt6T791EJkazYDuZX2d1PI3Aroz1L6Sv0Ths18NxRw5Gf8Zn9wR6tmzOSpATDAi VnuvtmpLWhbtFjZ1oSdvDohNgCx0pkL1vZGQUYYIkFYkxPaP/RDsYk3NZDK+w/2INV7IEV PUVfVTyqTQ4tBwHfB8L6jfcra2Dsqkay+/80SSOHv7ezmEkjheBRZf7lWRzoOGnhs2yWFb Wyc1OFAj/buQu10iSNWSuRYhwlC4lJ2eMNTD1xq4SES3W2nwmV6nZ/c5MmrJbg== Received: from aniel.nours.eu (nours.eu [IPv6:2001:41d0:8:3a4d::1]) (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) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4SgPDg5HPNzsHZ; Wed, 29 Nov 2023 16:00:35 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id 4DDDA1CCF0; Wed, 29 Nov 2023 17:00:34 +0100 (CET) Date: Wed, 29 Nov 2023 17:00:34 +0100 From: Baptiste Daroussin To: Warner Losh Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: db0a4f2d7a65 - main - openzfs: unbreak 32-bit builds. Message-ID: <6efureb5she43sgdpfrkwl7alcemv3yd322hcqeo35qk3jbs3y@xbr2e7o6e4b5> References: <202311291557.3ATFv85t076225@gitrepo.freebsd.org> 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202311291557.3ATFv85t076225@gitrepo.freebsd.org> Thank you! Best regards, Bapt On Wed, Nov 29, 2023 at 03:57:08PM +0000, Warner Losh wrote: > 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); > } >