Merge back a kernel attr2 fix into libxfs.

diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c
index 35a531bf55ebcb4a0ac2a138a994eb8f8d88794c..284abc005c9c351e8100a6bd1b6b74cbeb3d8b17 100644 (file)
--- a/libxfs/xfs_bmap.c
+++ b/libxfs/xfs_bmap.c
@@ -3331,19 +3331,20 @@ xfs_bmap_add_attrfork(
                goto error2;
        if (!XFS_SB_VERSION_HASATTR(&mp->m_sb) ||
           (!XFS_SB_VERSION_HASATTR2(&mp->m_sb) && version == 2)) {
-               logflags = 0;
+               __int64_t sbfields = 0;
+
                s = XFS_SB_LOCK(mp);
                if (!XFS_SB_VERSION_HASATTR(&mp->m_sb)) {
                        XFS_SB_VERSION_ADDATTR(&mp->m_sb);
-                       logflags |= XFS_SB_VERSIONNUM;
+                       sbfields |= XFS_SB_VERSIONNUM;
                }
                if (!XFS_SB_VERSION_HASATTR2(&mp->m_sb) && version == 2) {
                        XFS_SB_VERSION_ADDATTR2(&mp->m_sb);
-                       logflags |= (XFS_SB_VERSIONNUM | XFS_SB_FEATURES2);
+                       sbfields |= (XFS_SB_VERSIONNUM | XFS_SB_FEATURES2);
                }
-               if (logflags) {
+               if (sbfields) {
                        XFS_SB_UNLOCK(mp, s);
-                       xfs_mod_sb(tp, logflags);
+                       xfs_mod_sb(tp, sbfields);
                } else
                        XFS_SB_UNLOCK(mp, s);
        }