From nobody Fri Aug 26 07:32:23 2022 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 4MDWkb6BCtz4ZT86; Fri, 26 Aug 2022 07:32:23 +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 4MDWkb5VZYz3f2B; Fri, 26 Aug 2022 07:32:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661499143; 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=v5IFYyTq1z6nMpTqpOoT08wQAwjUsCIi3/UUeGkjilU=; b=NipH4+83a8ykKLywp6wojlqY8xy95RiWiD6QgNGO3r1UQoOesoErG6Wg26eGbRsidirfna GPAJ7vN2RsM+XAgEvpu1be4TCzad3QF/gq72c7KRyddoFdyhXaS/83Oreb2Jc+0K9wdp30 O0gEKGr/ozsjXVXl6eHBPzw2zgh6bF8KLY9WOBYrg8HyPaT8ViXcir3dbh7AjWOqqRVWrM GOsY1ySjQvEE438uhOKD9JfklUcNTSVoGWcZySTgOHJLkbS2nLRgpc0NK+bdpAjOftkoyP GOt9tOsKyKU+S4068zgySunDw0QnK+/Qs9x08k1t7td0RZQYO9IYrj5Azb8iLA== 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 4MDWkb4bZBzKc2; Fri, 26 Aug 2022 07:32:23 +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 27Q7WNEY030232; Fri, 26 Aug 2022 07:32:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27Q7WNpE030231; Fri, 26 Aug 2022 07:32:23 GMT (envelope-from git) Date: Fri, 26 Aug 2022 07:32:23 GMT Message-Id: <202208260732.27Q7WNpE030231@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: 27c6009e7237 - main - Correct diagnostic messages for bad cylinder groups. 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27c6009e7237597a502521e0255a74164ff6bea7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661499143; 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=v5IFYyTq1z6nMpTqpOoT08wQAwjUsCIi3/UUeGkjilU=; b=Rn07LixviDzATttChnliYOHiHEo314G6Hu50B5OUNZf8DC4WWOn/ElzW4U38QI0pbHCeYr kZGHD8OFJiWvl9EeEawqAXOq1PqgBPAG1jNlaKP+qqHEncksTZ9WCFRPcV7QXRvPja7GvH 7NP1zOHjvD9IXtrkNr7B7rI9yA0/gYm1Dr+C0LUnYDkjeE0jjoiUhRmetKk5dbsoT499Tm dVhVBR11Uc6qhJI1eUJj8NvDGupJiV3wy0WGI5T8LOiMh69fYgbmeeeAypw5DafMwOWNcP cuilNh4/Er/iy6g07CXlSYmKusxjuaWyyE94/zrl4p6u/e8ABHb8eZMIuK5jrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661499143; a=rsa-sha256; cv=none; b=MRQfBOKyPridX7NO4aF1CiL8ksGG8ZkEpl72FEfPM5x3b6gCT9XMoyrbRhRAqwW1RZMemy 7Bhkz9Cw5cKJiMc4zh+fIzscWEcoh84ZD5dCVY4ZHgfjjVEXUaWOqtdOc9HOnNA5jmJOrK WcA1faKvIYrkQ2Oxg/NH/Irc8bkvFjU3XCyEd+SvfJ3kFfPdCG/MEdYJLveUYyc5jea4QX 7bEoxU40koZ+8I3oSJgfFm5A8eB82NcbndIKw5hKFIQNhDGZ8ViWCqjQXdXVzOu13pBtRN hgGqZ8KfbAb2kRfKXysj2USgBcyXrNd3e6F+iDbRhxSFAOvZCgNqMYt/9Ccgfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=27c6009e7237597a502521e0255a74164ff6bea7 commit 27c6009e7237597a502521e0255a74164ff6bea7 Author: Kirk McKusick AuthorDate: 2022-08-26 07:31:44 +0000 Commit: Kirk McKusick CommitDate: 2022-08-26 07:31:44 +0000 Correct diagnostic messages for bad cylinder groups. Fix for 495b1ba. Reported by: Mike Karels 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 7d6a936c90a9..6b4cdc146def 100644 --- a/sbin/fsck_ffs/fsutil.c +++ b/sbin/fsck_ffs/fsutil.c @@ -952,9 +952,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