diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-05-20 08:57:02 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-05-20 08:57:02 +1000 |
| commit | b70f14e1ffbb47369b1cc2cdf558c3468ae9e484 (patch) | |
| tree | cccbdd2422a7338a8185eb83493ffac3bb4ddaa9 /fs/xfs/xfs_sb.c | |
| parent | 0d907a3bb4a77cffebebd17c323e898048301aa3 (diff) | |
| parent | ab3e57b53f549ad51cbdf85e846ca4eaf0f3be30 (diff) | |
| download | linux-rpi3-b70f14e1ffbb47369b1cc2cdf558c3468ae9e484.tar.gz linux-rpi3-b70f14e1ffbb47369b1cc2cdf558c3468ae9e484.tar.bz2 linux-rpi3-b70f14e1ffbb47369b1cc2cdf558c3468ae9e484.zip | |
Merge branch 'xfs-feature-bit-cleanup' into for-next
Conflicts:
fs/xfs/xfs_inode.c
Diffstat (limited to 'fs/xfs/xfs_sb.c')
| -rw-r--r-- | fs/xfs/xfs_sb.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/fs/xfs/xfs_sb.c b/fs/xfs/xfs_sb.c index 8baf61afae1d..c3453b11f563 100644 --- a/fs/xfs/xfs_sb.c +++ b/fs/xfs/xfs_sb.c @@ -291,7 +291,8 @@ xfs_mount_validate_sb( (sbp->sb_imax_pct > 100 /* zero sb_imax_pct is valid */) || sbp->sb_dblocks == 0 || sbp->sb_dblocks > XFS_MAX_DBLOCKS(sbp) || - sbp->sb_dblocks < XFS_MIN_DBLOCKS(sbp))) { + sbp->sb_dblocks < XFS_MIN_DBLOCKS(sbp) || + sbp->sb_shared_vn != 0)) { xfs_notice(mp, "SB sanity check failed"); return XFS_ERROR(EFSCORRUPTED); } @@ -333,15 +334,6 @@ xfs_mount_validate_sb( xfs_warn(mp, "Offline file system operation in progress!"); return XFS_ERROR(EFSCORRUPTED); } - - /* - * Version 1 directory format has never worked on Linux. - */ - if (unlikely(!xfs_sb_version_hasdirv2(sbp))) { - xfs_warn(mp, "file system using version 1 directory format"); - return XFS_ERROR(ENOSYS); - } - return 0; } |