1 files changed, 3 insertions, 21 deletions

diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index bb753b359bee..536a0ee9cd5a 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -185,9 +185,6 @@ xfs_initialize_perag(
         xfs_agnumber_t  index;
         xfs_agnumber_t  first_initialised = 0;
         xfs_perag_t     *pag;
-        xfs_agino_t     agino;
-        xfs_ino_t       ino;
-        xfs_sb_t        *sbp = &mp->m_sb;
         int             error = -ENOMEM;
 
         /*
@@ -230,22 +227,7 @@ xfs_initialize_perag(
                 radix_tree_preload_end();
         }
 
-        /*
-         * If we mount with the inode64 option, or no inode overflows
-         * the legacy 32-bit address space clear the inode32 option.
-         */
-        agino = XFS_OFFBNO_TO_AGINO(mp, sbp->sb_agblocks - 1, 0);
-        ino = XFS_AGINO_TO_INO(mp, agcount - 1, agino);
-
-        if ((mp->m_flags & XFS_MOUNT_SMALL_INUMS) && ino > XFS_MAXINUMBER_32)
-                mp->m_flags |= XFS_MOUNT_32BITINODES;
-        else
-                mp->m_flags &= ~XFS_MOUNT_32BITINODES;
-
-        if (mp->m_flags & XFS_MOUNT_32BITINODES)
-                index = xfs_set_inode32(mp, agcount);
-        else
-                index = xfs_set_inode64(mp, agcount);
+        index = xfs_set_inode_alloc(mp, agcount);
 
         if (maxagi)
                 *maxagi = index;
@@ -865,7 +847,7 @@ xfs_mountfs(
 
         ASSERT(rip != NULL);
 
-        if (unlikely(!S_ISDIR(rip->i_d.di_mode))) {
+        if (unlikely(!S_ISDIR(VFS_I(rip)->i_mode))) {
                 xfs_warn(mp, "corrupted root inode %llu: not a directory",
                         (unsigned long long)rip->i_ino);
                 xfs_iunlock(rip, XFS_ILOCK_EXCL);
@@ -1284,7 +1266,7 @@ xfs_getsb(
         }
 
         xfs_buf_hold(bp);
-        ASSERT(XFS_BUF_ISDONE(bp));
+        ASSERT(bp->b_flags & XBF_DONE);
         return bp;
 }