1 files changed, 5 insertions, 5 deletions

diff --git a/fs/xfs/xfs_ialloc.c b/fs/xfs/xfs_ialloc.c
index ab016e5ae7be..62d1ceae0943 100644
--- a/fs/xfs/xfs_ialloc.c
+++ b/fs/xfs/xfs_ialloc.c
@@ -230,7 +230,7 @@ xfs_ialloc_ag_alloc(
                 args.minalignslop = xfs_ialloc_cluster_alignment(&args) - 1;
 
                 /* Allow space for the inode btree to split. */
-                args.minleft = XFS_IN_MAXLEVELS(args.mp) - 1;
+                args.minleft = args.mp->m_in_maxlevels - 1;
                 if ((error = xfs_alloc_vextent(&args)))
                         return error;
         } else
@@ -270,7 +270,7 @@ xfs_ialloc_ag_alloc(
                 /*
                  * Allow space for the inode btree to split.
                  */
-                args.minleft = XFS_IN_MAXLEVELS(args.mp) - 1;
+                args.minleft = args.mp->m_in_maxlevels - 1;
                 if ((error = xfs_alloc_vextent(&args)))
                         return error;
         }
@@ -943,7 +943,7 @@ nextag:
         ASSERT((XFS_AGINO_TO_OFFSET(mp, rec.ir_startino) %
                                    XFS_INODES_PER_CHUNK) == 0);
         ino = XFS_AGINO_TO_INO(mp, agno, rec.ir_startino + offset);
-        XFS_INOBT_CLR_FREE(&rec, offset);
+        rec.ir_free &= ~XFS_INOBT_MASK(offset);
         rec.ir_freecount--;
         if ((error = xfs_inobt_update(cur, rec.ir_startino, rec.ir_freecount,
                         rec.ir_free)))
@@ -1105,11 +1105,11 @@ xfs_difree(
          */
         off = agino - rec.ir_startino;
         ASSERT(off >= 0 && off < XFS_INODES_PER_CHUNK);
-        ASSERT(!XFS_INOBT_IS_FREE(&rec, off));
+        ASSERT(!(rec.ir_free & XFS_INOBT_MASK(off)));
         /*
          * Mark the inode free & increment the count.
          */
-        XFS_INOBT_SET_FREE(&rec, off);
+        rec.ir_free |= XFS_INOBT_MASK(off);
         rec.ir_freecount++;
 
         /*