1 files changed, 3 insertions, 4 deletions

diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
index 2e9b34b7344b..97f0328b5ac2 100644
--- a/fs/xfs/xfs_bmap.c
+++ b/fs/xfs/xfs_bmap.c
@@ -3956,7 +3956,6 @@ xfs_bmap_add_attrfork(
         xfs_bmap_free_t         flist;          /* freed extent records */
         xfs_mount_t             *mp;            /* mount structure */
         xfs_trans_t             *tp;            /* transaction pointer */
-        unsigned long           s;              /* spinlock spl value */
         int                     blks;           /* space reservation */
         int                     version = 1;    /* superblock attr version */
         int                     committed;      /* xaction was committed */
@@ -4053,7 +4052,7 @@ xfs_bmap_add_attrfork(
            (!XFS_SB_VERSION_HASATTR2(&mp->m_sb) && version == 2)) {
                 __int64_t sbfields = 0;
 
-                s = XFS_SB_LOCK(mp);
+                spin_lock(&mp->m_sb_lock);
                 if (!XFS_SB_VERSION_HASATTR(&mp->m_sb)) {
                         XFS_SB_VERSION_ADDATTR(&mp->m_sb);
                         sbfields |= XFS_SB_VERSIONNUM;
@@ -4063,10 +4062,10 @@ xfs_bmap_add_attrfork(
                         sbfields |= (XFS_SB_VERSIONNUM | XFS_SB_FEATURES2);
                 }
                 if (sbfields) {
-                        XFS_SB_UNLOCK(mp, s);
+                        spin_unlock(&mp->m_sb_lock);
                         xfs_mod_sb(tp, sbfields);
                 } else
-                        XFS_SB_UNLOCK(mp, s);
+                        spin_unlock(&mp->m_sb_lock);
         }
         if ((error = xfs_bmap_finish(&tp, &flist, &committed)))
                 goto error2;