From nobody Fri May 19 23:54:24 2023 X-Original-To: dev-commits-src-branches@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 4QNNww6BHQz4CX8p; Fri, 19 May 2023 23:54:24 +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 4QNNww5YRpz3vg0; Fri, 19 May 2023 23:54:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684540464; 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=IiKDEkSV26Dnc7Fg4xPeYqOgW4EjAb2lsUDFOcT6CKk=; b=xJ3U/I3Q7RhtriTyfRZI1sbdf37EdjKbPLquHQcwM0kFhIKR0k3XzCpwiHszYdHqelaT4w 7dn4uEYs3CoMeBzLBvQ9mzMBLUaazRLk2oW9IeUINRfnp7366bglsDjtLIzrgNpo4Uhnw+ CDuvZat19dY0OOdO22oSdFu1fhVqmE3z8D3d3JRi8rrqpM9OBC5yTuBU/EUftHP2fw0jz7 OtCJeyIBd8o10Spnrg+4iZsR2D1rBAfZjBK/o72mD148MLfx5wQmX8YUrCUvkfpYEa0R3a vLc9BEASR6n1vF2PJYTEk/gcGGl/YKF+7xuNS1wP23pLtdradMEfwghA4IsDuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684540464; 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=IiKDEkSV26Dnc7Fg4xPeYqOgW4EjAb2lsUDFOcT6CKk=; b=S7c8uFpBTC3sC9IQZJcPEGHl2BAz2yoqEGIls0Cp8ZCj+X2sW3Qiwt2ZkaJ9PCevGvQyFE 7vKrfOYUNi9rPZjJttePbbF5E1NvSuensDNwML+4KqF4HXR/OGsAAlnoojpa8OwV8M8DNs z31K4E7LpQ71l9hiiCAFeCkmbbnVPuKdIQ75CR1G9ovm5o9SeRGLM8cdpbIim8wFFGxMCX 8VZTUGq/rQ0avhCnpMiSuYMVeFHWxo7Ek61+pKVOMx/HVDlG1QhJcRMYLe7CRj/4hTMhLi 2x8qJiAtlYIovguP7YJrkOhA2D3AKLRXYPvz9qPaH7kh6RL26PNXhOkNr0pSmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684540464; a=rsa-sha256; cv=none; b=bkuCgnznduqvUKAbfUF6JjXcB7v0Pr0JB50uZJZybN6ineZwVtpBUjPbfrmwKgb+/VUSPx OfcA8kyN3zFtToKy/CM/TUoJZtfAtC72mruqsnmX8O9n/g3f8/VKwZL0QmKlwcHFQ9T9fo 3PmTr/G5acpD9RKI1Th9fX88ESWTZOFB+4GlD3Z8leHqLm2ginYeMWSgjmXlU1Lxf2Ml7H 4T1XVqXt87bGeqU6ePdnmxv9S+EnyjsLoNk784dH1ajKXe5mTxDuvKskpWTrGVEqru/SCY 9cPuliQikIJy4UNNmeW9XtLhIar+aWB+epOSX3ZgETHvL14G0VsjafqFdThhGg== 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 4QNNww4cs0znqQ; Fri, 19 May 2023 23:54:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34JNsOsC064789; Fri, 19 May 2023 23:54:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34JNsOH6064788; Fri, 19 May 2023 23:54:24 GMT (envelope-from git) Date: Fri, 19 May 2023 23:54:24 GMT Message-Id: <202305192354.34JNsOH6064788@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 5188186cd4dd - stable/13 - newfs: fix up 32-bit compile List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5188186cd4ddcdb1c15da31b12c6b26eeb683c1d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=5188186cd4ddcdb1c15da31b12c6b26eeb683c1d commit 5188186cd4ddcdb1c15da31b12c6b26eeb683c1d Author: Mateusz Guzik AuthorDate: 2023-04-30 18:00:20 +0000 Commit: Kirk McKusick CommitDate: 2023-05-19 22:44:49 +0000 newfs: fix up 32-bit compile (cherry picked from commit a50ef47c0a22ca87cdbe669acbcbf999c72b8439) --- sbin/newfs/mkfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c index fa00445baea8..1efada0dad17 100644 --- a/sbin/newfs/mkfs.c +++ b/sbin/newfs/mkfs.c @@ -671,7 +671,7 @@ retry: if ((int32_t)CGSIZE(&sblock) > sblock.fs_bsize) { printf("INTERNAL ERROR: ipg %d, fpg %d, contigsumsize %d, ", sblock.fs_ipg, sblock.fs_fpg, sblock.fs_contigsumsize); - printf("old_cpg %d, size_cg %jd, CGSIZE %jd\n", + printf("old_cpg %d, size_cg %zu, CGSIZE %zu\n", sblock.fs_old_cpg, sizeof(struct cg), CGSIZE(&sblock)); printf("Please file a FreeBSD bug report and include this " "output\n");