1 files changed, 6 insertions, 6 deletions

diff --git a/fs/xfs/xfs_attr_leaf.c b/fs/xfs/xfs_attr_leaf.c
index 52a847e6abf7..35e557b00db2 100644
--- a/fs/xfs/xfs_attr_leaf.c
+++ b/fs/xfs/xfs_attr_leaf.c
@@ -117,12 +117,6 @@ xfs_attr_shortform_bytesfit(xfs_inode_t *dp, int bytes)
         int maxforkoff; /* upper limit on valid forkoff locations */
         xfs_mount_t *mp = dp->i_mount;
 
-        if (unlikely(mp->m_flags & XFS_MOUNT_COMPAT_ATTR)) {
-                if (bytes <= XFS_IFORK_ASIZE(dp))
-                        return mp->m_attroffset >> 3;
-                return 0;
-        }
-
         offset = (XFS_LITINO(mp) - bytes) >> 3; /* rounded down */
 
         switch (dp->i_d.di_format) {
@@ -134,6 +128,12 @@ xfs_attr_shortform_bytesfit(xfs_inode_t *dp, int bytes)
                 return (offset >= minforkoff) ? minforkoff : 0;
         }
 
+        if (unlikely(mp->m_flags & XFS_MOUNT_COMPAT_ATTR)) {
+                if (bytes <= XFS_IFORK_ASIZE(dp))
+                        return mp->m_attroffset >> 3;
+                return 0;
+        }
+
         /* data fork btree root can have at least this many key/ptr pairs */
         minforkoff = MAX(dp->i_df.if_bytes, XFS_BMDR_SPACE_CALC(MINDBTPTRS));
         minforkoff = roundup(minforkoff, 8) >> 3;