git: 27c6009e7237 - main - Correct diagnostic messages for bad cylinder groups.

The branch main has been updated by mckusick:

URL: https://cgit.FreeBSD.org/src/commit/?id=27c6009e7237597a502521e0255a74164ff6bea7

commit 27c6009e7237597a502521e0255a74164ff6bea7
Author:     Kirk McKusick <mckusick@FreeBSD.org>
AuthorDate: 2022-08-26 07:31:44 +0000
Commit:     Kirk McKusick <mckusick@FreeBSD.org>
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