1 files changed, 5 insertions, 12 deletions

diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index 6420ca8df5ec..8c830a48165a 100644
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -183,9 +183,8 @@ xfs_getattr(
                          * realtime extent size or the realtime volume's
                          * extent size.
                          */
-                        vap->va_blocksize = ip->i_d.di_extsize ?
-                                (ip->i_d.di_extsize << mp->m_sb.sb_blocklog) :
-                                (mp->m_sb.sb_rextsize << mp->m_sb.sb_blocklog);
+                        vap->va_blocksize =
+                                xfs_get_extsz_hint(ip) << mp->m_sb.sb_blocklog;
                 }
                 break;
         }
@@ -4055,22 +4054,16 @@ xfs_alloc_file_space(
         if (XFS_FORCED_SHUTDOWN(mp))
                 return XFS_ERROR(EIO);
 
-        rt = XFS_IS_REALTIME_INODE(ip);
-        if (unlikely(rt)) {
-                if (!(extsz = ip->i_d.di_extsize))
-                        extsz = mp->m_sb.sb_rextsize;
-        } else {
-                extsz = ip->i_d.di_extsize;
-        }
-
         if ((error = XFS_QM_DQATTACH(mp, ip, 0)))
                 return error;
 
         if (len <= 0)
                 return XFS_ERROR(EINVAL);
 
+        rt = XFS_IS_REALTIME_INODE(ip);
+        extsz = xfs_get_extsz_hint(ip);
+
         count = len;
-        error = 0;
         imapp = &imaps[0];
         nimaps = 1;
         bmapi_flag = XFS_BMAPI_WRITE | (alloc_type ? XFS_BMAPI_PREALLOC : 0);