diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-08-04 05:54:14 +0200 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-08-04 05:54:14 +0200 |
| commit | 4d7eece2c0dad832c5f224629eba3cced3f2d6cd (patch) | |
| tree | cddf541ea3c2860aaea0fed1f57871d310c3c14e /fs/xfs/xfs_mount.c | |
| parent | Merge branch 'xfs-quota-eofblocks-scan' into for-next (diff) | |
| parent | xfs: require 64-bit sector_t (diff) | |
| download | linux-4d7eece2c0dad832c5f224629eba3cced3f2d6cd.tar.xz linux-4d7eece2c0dad832c5f224629eba3cced3f2d6cd.zip | |
Merge branch 'xfs-misc-fixes-3.17-1' into for-next
Diffstat (limited to 'fs/xfs/xfs_mount.c')
| -rw-r--r-- | fs/xfs/xfs_mount.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index 39d84d379bbd..5b639df0413e 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c @@ -176,13 +176,9 @@ xfs_sb_validate_fsb_count( ASSERT(PAGE_SHIFT >= sbp->sb_blocklog); ASSERT(sbp->sb_blocklog >= BBSHIFT); -#if XFS_BIG_BLKNOS /* Limited by ULONG_MAX of page cache index */ + /* Limited by ULONG_MAX of page cache index */ if (nblocks >> (PAGE_CACHE_SHIFT - sbp->sb_blocklog) > ULONG_MAX) return -EFBIG; -#else /* Limited by UINT_MAX of sectors */ - if (nblocks << (sbp->sb_blocklog - BBSHIFT) > UINT_MAX) - return -EFBIG; -#endif return 0; } @@ -253,9 +249,9 @@ xfs_initialize_perag( mp->m_flags &= ~XFS_MOUNT_32BITINODES; if (mp->m_flags & XFS_MOUNT_32BITINODES) - index = xfs_set_inode32(mp); + index = xfs_set_inode32(mp, agcount); else - index = xfs_set_inode64(mp); + index = xfs_set_inode64(mp, agcount); if (maxagi) *maxagi = index; |