git: 78d3befffba2 - stable/13 - Correct diagnostic messages for bad cylinder groups.

From: Kirk McKusick <mckusick_at_FreeBSD.org>
Date: Sun, 11 Dec 2022 00:38:16 UTC
The branch stable/13 has been updated by mckusick:

URL: https://cgit.FreeBSD.org/src/commit/?id=78d3befffba2d3171811651906f36e6ad695a065

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