[XFS] Fix superblock validation regression for the zero imaxpct case.

natoscott · natoscott · commit e50bd16fe496 · 2006-04-11T15:10:45.000+10:00
Thanks to kjamieson for noticing.

SGI-PV: 951661
SGI-Modid: xfs-linux-melb:xfs-kern:25675a

Signed-off-by: Nathan Scott &lt;nathans@sgi.com&gt;
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
@@ -270,7 +270,7 @@ xfs_mount_validate_sb(
 	    (sbp->sb_blocklog - sbp->sb_inodelog != sbp->sb_inopblog)	||
 	    (sbp->sb_rextsize * sbp->sb_blocksize > XFS_MAX_RTEXTSIZE)	||
 	    (sbp->sb_rextsize * sbp->sb_blocksize < XFS_MIN_RTEXTSIZE)	||
-	    (sbp->sb_imax_pct > 100 || sbp->sb_imax_pct < 1))) {
+	    (sbp->sb_imax_pct > 100 /* zero sb_imax_pct is valid */))) {
 		xfs_fs_mount_cmn_err(flags, "SB sanity check 1 failed");
 		return XFS_ERROR(EFSCORRUPTED);
 	}

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ xfs_mount_validate_sb(`
`270`	`270`	`(sbp->sb_blocklog - sbp->sb_inodelog != sbp->sb_inopblog) \|\|`
`271`	`271`	`(sbp->sb_rextsize * sbp->sb_blocksize > XFS_MAX_RTEXTSIZE) \|\|`
`272`	`272`	`(sbp->sb_rextsize * sbp->sb_blocksize < XFS_MIN_RTEXTSIZE) \|\|`
`273`		`- (sbp->sb_imax_pct > 100 \|\| sbp->sb_imax_pct < 1))) {`
	`273`	`+ (sbp->sb_imax_pct > 100 /* zero sb_imax_pct is valid */))) {`
`274`	`274`	`xfs_fs_mount_cmn_err(flags, "SB sanity check 1 failed");`
`275`	`275`	`return XFS_ERROR(EFSCORRUPTED);`
`276`	`276`	`}`