diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index 438745f8eb4..d8757983261 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -348,9 +348,21 @@ validate_sblock(struct fs *fs, int isaltsblk) %jd); } else if (fs->fs_magic == FS_UFS1_MAGIC) { if (!isaltsblk) { - CHK(fs->fs_sblockloc, >, SBLOCK_UFS1, %#jx); - CHK2(fs->fs_sblockactualloc, !=, SBLOCK_UFS1, - fs->fs_sblockactualloc, !=, 0, %jd); + CHK(fs->fs_sblockloc, >, SBLOCK_UFS1, %jd); + /* + * For UFS1 the with a 65536 block size, the first + * backup superblock is at the same location as the + * UFS2 superblock. Since SBLOCK_UFS2 is the first + * location checked, the first backup is the + * superblock that will be accessed. + */ + if (fs->fs_bsize == SBLOCK_UFS2) { + CHK(fs->fs_sblockactualloc, >, SBLOCK_UFS2, + %jd); + } else { + CHK2(fs->fs_sblockactualloc, !=, SBLOCK_UFS1, + fs->fs_sblockactualloc, !=, 0, %jd); + } } CHK(fs->fs_nindir, !=, fs->fs_bsize / sizeof(ufs1_daddr_t), %jd); @@ -382,7 +394,6 @@ validate_sblock(struct fs *fs, int isaltsblk) CHK(fs->fs_bsize, >, MAXBSIZE, %jd); CHK(fs->fs_bsize, <, roundup(sizeof(struct fs), DEV_BSIZE), %jd); CHK(fs->fs_sbsize, >, SBLOCKSIZE, %jd); - CHK(fs->fs_sbsize, <, fs->fs_fsize, %jd); CHK(powerof2(fs->fs_bsize), ==, 0, %jd); CHK(fs->fs_fsize, <, sectorsize, %jd); CHK(fs->fs_fsize, >, fs->fs_bsize, %jd);