diff options
author | Dave Chinner <david@fromorbit.com> | 2014-02-20 15:16:09 +1100 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2014-02-20 15:16:09 +1100 |
commit | b678573e29749e7fe884c3a8e61c1cf1e1093987 (patch) | |
tree | 32b02db96ee1f20d98f414e91325afa8d08ebd9c /fs/xfs/xfs_sb.c | |
parent | 5ef11eb0700f806c4671ba33e5befa784a2f70ef (diff) | |
parent | 492185ef1dd261768203a6c3accfd445cde8c503 (diff) | |
download | blackbird-op-linux-b678573e29749e7fe884c3a8e61c1cf1e1093987.tar.gz blackbird-op-linux-b678573e29749e7fe884c3a8e61c1cf1e1093987.zip |
Merge branch 'xfs-fixes-for-3.15' into for-next
Diffstat (limited to 'fs/xfs/xfs_sb.c')
-rw-r--r-- | fs/xfs/xfs_sb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/xfs/xfs_sb.c b/fs/xfs/xfs_sb.c index 1e116794bb66..75161a2060fb 100644 --- a/fs/xfs/xfs_sb.c +++ b/fs/xfs/xfs_sb.c @@ -288,6 +288,7 @@ xfs_mount_validate_sb( sbp->sb_inodelog < XFS_DINODE_MIN_LOG || sbp->sb_inodelog > XFS_DINODE_MAX_LOG || sbp->sb_inodesize != (1 << sbp->sb_inodelog) || + sbp->sb_inopblock != howmany(sbp->sb_blocksize,sbp->sb_inodesize) || (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) || |