Merge remote-tracking branches 'asoc/topic/ab8500', 'asoc/topic/ac97' and 'asoc/topic...

[firefly-linux-kernel-4.4.55.git] / fs / xfs / xfs_mount.c

diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index 39d84d379bbde8ab321367d5135b0a88c9baa943..fbf0384a466fa25fba334862b0c1762be68ab6d4 100644 (file)
--- 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;
@@ -327,7 +323,6 @@ reread:
         * Initialize the mount structure from the superblock.
         */
        xfs_sb_from_disk(sbp, XFS_BUF_TO_SBP(bp));
-       xfs_sb_quota_from_disk(sbp);
 
        /*
         * If we haven't validated the superblock, do so now before we try