d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates to UFS/FFS superblock integrity checks when reading a superblock.

Browse Source 
Minor optimization that makes semantics of check clearer.

Sponsored by: The FreeBSD Foundation
This commit is contained in:
Kirk McKusick 2022-12-03 21:33:09 -08:00
parent e3b74ec119
commit e15d8f2384
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/ufs/ffs/ffs_subr.c
View File

@ -407,7 +407,7 @@ validate_sblock(struct fs *fs, int flags)
FCHK(powerof2(fs->fs_fsize), ==, 0, %jd);
FCHK(fs->fs_sbsize, >, SBLOCKSIZE, %jd);
FCHK(fs->fs_sbsize, <, (signed)sizeof(struct fs), %jd);
FCHK(fs->fs_sbsize % dbtob(1), !=, 0, %jd);
FCHK(fs->fs_sbsize % sectorsize, !=, 0, %jd);
FCHK(fs->fs_fpg, <, 3 * fs->fs_frag, %jd);
FCHK(fs->fs_ncg, <, 1, %jd);
FCHK(fs->fs_fsbtodb, !=, ILOG2(fs->fs_fsize / sectorsize), %jd);
@ -505,7 +505,7 @@ validate_sblock(struct fs *fs, int flags)
*/
if (error)
return (error);
FCHK(fs->fs_sbsize % dbtob(1), !=, 0, %jd);
FCHK(fs->fs_sbsize % sectorsize, !=, 0, %jd);
FCHK(fs->fs_ipg % fs->fs_inopb, !=, 0, %jd);
FCHK(fs->fs_sblkno, !=, roundup(
howmany(fs->fs_sblockloc + SBLOCKSIZE, fs->fs_fsize),