From nobody Sun Dec 11 00:38:16 2022 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 4NV5TN2f1Bz4jgM1; Sun, 11 Dec 2022 00:38:16 +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 4NV5TN24p5z4HFb; Sun, 11 Dec 2022 00:38:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670719096; 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=Ox9hnzA4dlqx8dqPdlK7K4cAn2IiHC1MPO3Oar6NHus=; b=HUuYXPSXFHKf/pWlbAe+s/OwJrJIYY2g7W7Qb6uNECzA1Go5nZaCpUlnAHVmX96Nfd9Yxc PaluBf61c20NyBhyB6jHPXUJf4p1Zkbts3+XBU6yz7FxIiiDD3p/AtcJNTOty3CFzJCJva hGQzqr5Ayv18YUpEqCTau1pD6YUTGaNd8/gkHdZHtpayy4pODtw2Yd+WZFzonhySi2X+18 PJFzyvV8HriWHUFHdHD7ScUwdE4uWjaUDFJf/2cP5/sRyM9ZBCpx+lXMz41mJbIa0tP5mD 0FGn3w4XQqkuKVBm/bwN4HrY5G3ob3YiO8NWjTr1HNuyRrxGLgtRaQmSJG53dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670719096; 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=Ox9hnzA4dlqx8dqPdlK7K4cAn2IiHC1MPO3Oar6NHus=; b=v6U3dveXwwGg6WVbFVkSI0SdpZa2DQW3OVATGzX+D0kJj8jHq0XXgtEHrg9o9W6tJlh7uL 2vI0mnYbgmhorIv/UZfXIS3nCBucBzIdvmu4V58ueVjBHmwDIZ1mYkpPVFdIUCYk5+WkwS jWCVu16sTCxcqWow/rZXU5EqhFP7lt0MTEMfklibRhX+DTRn8Fc3Aro8Ks+3yaeCFy6YTY 0pHt5sYrglM6WKyRXywc5jfUC+HwM7ppuKlszYslmv8FMrsIVmnQ7a+8WQ0qPAWTb5Bz7E eGkXGyCsHxOBUulYNc2ql1Z2sFy8lPnzVB7NA+j/GA2Y4fJQ0sN4Fvggp0y0EA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670719096; a=rsa-sha256; cv=none; b=oHDAr3gXbYX6JM0jHA4sFfH2qfQQeQ4oe5QBh/CH8bqVeMifS7I6u8m3glphb4CvRfiHPF HBLhtlAkdwVe0XI+ITzoWts8jGUB4/ouqDNy4Bvywk6IaTxY4FHdYWm3YsCBGM+a3KmuWY 2jhROaUrVWPLSylABSiOWvg1RU4hOjk1qA4ViTcFRHjgAmI4bKG8LRG0nawAuVHNhggShf s+Oq46vufM/bW7mWUDPMi0L3i5QOihBEyNhMf0ctvvdJ+rRMdDr1lDfKyPPhnIw1DiIccN GeLzHo2I3vEzX06mUgoBi8fcQ1zv0gGj97rnx3LbDl9HH9bpGa5kCkJjNFIERA== 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 4NV5TN16JFzbV5; Sun, 11 Dec 2022 00:38:16 +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 2BB0cG2C003875; Sun, 11 Dec 2022 00:38:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BB0cGBA003874; Sun, 11 Dec 2022 00:38:16 GMT (envelope-from git) Date: Sun, 11 Dec 2022 00:38:16 GMT Message-Id: <202212110038.2BB0cGBA003874@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: 78d3befffba2 - stable/13 - Correct diagnostic messages for bad cylinder groups. 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: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 78d3befffba2d3171811651906f36e6ad695a065 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=78d3befffba2d3171811651906f36e6ad695a065 commit 78d3befffba2d3171811651906f36e6ad695a065 Author: Kirk McKusick AuthorDate: 2022-08-26 07:31:44 +0000 Commit: Kirk McKusick CommitDate: 2022-12-11 00:37:17 +0000 Correct diagnostic messages for bad cylinder groups. (cherry picked from commit 27c6009e7237597a502521e0255a74164ff6bea7) Sponsored by: The FreeBSD Foundation --- sbin/fsck_ffs/fsutil.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c index 0097ddff135e..f2d198fa294a 100644 --- a/sbin/fsck_ffs/fsutil.c +++ b/sbin/fsck_ffs/fsutil.c @@ -951,9 +951,10 @@ blzero(int fd, ufs2_daddr_t blk, long size) #undef CHK #define CHK(lhs, op, rhs, fmt) \ if (lhs op rhs) { \ - pwarn("UFS%d superblock failed: %s (" #fmt ") %s %s (" \ - #fmt ")\n", sblock.fs_magic == FS_UFS1_MAGIC ? 1 : \ - 2, #lhs, (intmax_t)lhs, #op, #rhs, (intmax_t)rhs); \ + pwarn("UFS%d cylinder group %d failed: " \ + "%s (" #fmt ") %s %s (" #fmt ")\n", \ + sblock.fs_magic == FS_UFS1_MAGIC ? 1 : 2, cg, \ + #lhs, (intmax_t)lhs, #op, #rhs, (intmax_t)rhs); \ error = 1; \ } int