git: 57b0fc30676f - stable/13 - Avoid unnecessary setting of UFS flag requesting fsck(8) be run.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 04 Feb 2022 22:47:19 UTC
The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=57b0fc30676f98dcb2c2dec2dcc21b1c93a69b73 commit 57b0fc30676f98dcb2c2dec2dcc21b1c93a69b73 Author: Kirk McKusick <mckusick@FreeBSD.org> AuthorDate: 2022-01-10 00:17:13 +0000 Commit: Kirk McKusick <mckusick@FreeBSD.org> CommitDate: 2022-02-04 22:45:49 +0000 Avoid unnecessary setting of UFS flag requesting fsck(8) be run. (cherry picked from commit 7ef56fb0498461edf4bf4c482fd8bc6fa126e0e9) --- sys/ufs/ffs/ffs_subr.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index 3e6cefa7be0c..361746571fdf 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -301,12 +301,9 @@ readsuper(void *devfd, struct fs **fsp, off_t sblockloc, int isaltsblk, "check-hash 0x%x != computed check-hash " "0x%x%s\n", fs->fs_ckhash, ckhash, chkhash == 0 ? " (Ignored)" : ""); - if (chkhash == 0) { - fs->fs_flags |= FS_NEEDSFSCK; - fs->fs_fmod = 1; + /* STDSB_NOHASHFAIL */ + if (chkhash == 0) return (0); - } - fs->fs_fmod = 0; return (EINTEGRITY); } /* Have to set for old filesystems that predate this field */