The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=9b8eb1c5b62d95217ecb7846af39440bb987d1c3
commit 9b8eb1c5b62d95217ecb7846af39440bb987d1c3 Author: Kirk McKusick <[email protected]> AuthorDate: 2021-11-16 00:10:02 +0000 Commit: Kirk McKusick <[email protected]> CommitDate: 2021-11-16 00:10:02 +0000 Followup to f2b391528ad9 to improve printed message. Sponsored by: Netflix --- sys/ufs/ffs/ffs_subr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index 09f03458e753..a3b7035e6a96 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -286,7 +286,7 @@ readsuper(void *devfd, struct fs **fsp, off_t sblockloc, int isaltsblk, res = uprintf("Superblock check-hash failed: recorded " "check-hash 0x%x != computed check-hash 0x%x%s\n", fs->fs_ckhash, ckhash, - chkhash == 0 ? " (Ignored)" : ""); + chkhash == STDSB_NOHASHFAIL ? " (Ignored)" : ""); #else res = 0; #endif @@ -298,7 +298,8 @@ readsuper(void *devfd, struct fs **fsp, off_t sblockloc, int isaltsblk, printf("Superblock check-hash failed: recorded " "check-hash 0x%x != computed check-hash " "0x%x%s\n", fs->fs_ckhash, ckhash, - chkhash == 0 ? " (Ignored)" : ""); + chkhash == STDSB_NOHASHFAIL ? + " (Ignored)" : ""); if (chkhash == STDSB) return (EINTEGRITY); /* chkhash == STDSB_NOHASHFAIL */
