Correct diagnostic messages for bad cylinder groups.

Fix for 495b1ba.

Reported by:  Mike Karels
Sponsored by: The FreeBSD Foundation
This commit is contained in:
Kirk McKusick 2022-08-26 00:31:44 -07:00
parent f0be378a66
commit 27c6009e72

View File

@ -952,9 +952,10 @@ blzero(int fd, ufs2_daddr_t blk, long size)
#undef CHK #undef CHK
#define CHK(lhs, op, rhs, fmt) \ #define CHK(lhs, op, rhs, fmt) \
if (lhs op rhs) { \ if (lhs op rhs) { \
pwarn("UFS%d superblock failed: %s (" #fmt ") %s %s (" \ pwarn("UFS%d cylinder group %d failed: " \
#fmt ")\n", sblock.fs_magic == FS_UFS1_MAGIC ? 1 : \ "%s (" #fmt ") %s %s (" #fmt ")\n", \
2, #lhs, (intmax_t)lhs, #op, #rhs, (intmax_t)rhs); \ sblock.fs_magic == FS_UFS1_MAGIC ? 1 : 2, cg, \
#lhs, (intmax_t)lhs, #op, #rhs, (intmax_t)rhs); \
error = 1; \ error = 1; \
} }
int int