1 files changed, 5 insertions, 3 deletions

diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
index 6c876012b2e5..a32c1dcae2ff 100644
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -203,10 +203,12 @@ xfs_bmap_rtalloc(
                 ralen = MAXEXTLEN / mp->m_sb.sb_rextsize;
 
         /*
-         * Lock out other modifications to the RT bitmap inode.
+         * Lock out modifications to both the RT bitmap and summary inodes
          */
         xfs_ilock(mp->m_rbmip, XFS_ILOCK_EXCL);
         xfs_trans_ijoin(ap->tp, mp->m_rbmip, XFS_ILOCK_EXCL);
+        xfs_ilock(mp->m_rsumip, XFS_ILOCK_EXCL);
+        xfs_trans_ijoin(ap->tp, mp->m_rsumip, XFS_ILOCK_EXCL);
 
         /*
          * If it's an allocation to an empty file at offset 0,
@@ -822,7 +824,7 @@ bool
 xfs_can_free_eofblocks(struct xfs_inode *ip, bool force)
 {
         /* prealloc/delalloc exists only on regular files */
-        if (!S_ISREG(ip->i_d.di_mode))
+        if (!S_ISREG(VFS_I(ip)->i_mode))
                 return false;
 
         /*
@@ -1727,7 +1729,7 @@ xfs_swap_extents(
         xfs_lock_two_inodes(ip, tip, XFS_MMAPLOCK_EXCL);
 
         /* Verify that both files have the same format */
-        if ((ip->i_d.di_mode & S_IFMT) != (tip->i_d.di_mode & S_IFMT)) {
+        if ((VFS_I(ip)->i_mode & S_IFMT) != (VFS_I(tip)->i_mode & S_IFMT)) {
                 error = -EINVAL;
                 goto out_unlock;
         }