git: 9cfb9a34bf15 - stable/13 - Eliminate unnecessary UFS1 integrity checks.

From: Kirk McKusick <mckusick_at_FreeBSD.org>
Date: Mon, 11 Mar 2024 20:51:00 UTC
The branch stable/13 has been updated by mckusick:

URL: https://cgit.FreeBSD.org/src/commit/?id=9cfb9a34bf154b27d21f9e2dfe8d2704ab664ed4

commit 9cfb9a34bf154b27d21f9e2dfe8d2704ab664ed4
Author:     Kirk McKusick <mckusick@FreeBSD.org>
AuthorDate: 2024-03-11 20:49:57 +0000
Commit:     Kirk McKusick <mckusick@FreeBSD.org>
CommitDate: 2024-03-11 20:50:48 +0000

    Eliminate unnecessary UFS1 integrity checks.
    
    This was missed in the cited cherry pick.
    
    This is a follow-on report to bug report 264450 (comments 21-33).
    
    Reported by: slb@sonnet.com
    Tested by:   slb@sonnet.com
    PR:          264450
    
    (cherry picked from commit b241767f8ef38f9ca7c109fe2fccd11ccbfaa4f0)
---
 sys/ufs/ffs/ffs_subr.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c
index ad9128f06266..ca595ed5bd80 100644
--- a/sys/ufs/ffs/ffs_subr.c
+++ b/sys/ufs/ffs/ffs_subr.c
@@ -392,7 +392,6 @@ validate_sblock(struct fs *fs, int isaltsblk)
 		CHK(fs->fs_old_rotdelay, !=, 0, %jd);
 		CHK(fs->fs_old_rps, !=, 60, %jd);
 		CHK(fs->fs_old_nspf, !=, fs->fs_fsize / sectorsize, %jd);
-		CHK(fs->fs_old_cpg, !=, 1, %jd);
 		CHK(fs->fs_old_interleave, !=, 1, %jd);
 		CHK(fs->fs_old_trackskew, !=, 0, %jd);
 		CHK(fs->fs_old_cpc, !=, 0, %jd);