xfs: use an XFS_OPSTATE_ flag for detecting if logged xattrs are available

Per reviewer request, use an OPSTATE flag (+ helpers) to decide if
logged xattrs are enabled, instead of querying the xfs_sb.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/xfs/xfs_attr_item.c b/fs/xfs/xfs_attr_item.c
index dfe7039dac9890907b82dc3b6f71be3e2a83b835..e5e7ddbc594b963281a3cf9a43cf38da7e01976e 100644 (file)
--- a/fs/xfs/xfs_attr_item.c
+++ b/fs/xfs/xfs_attr_item.c
@@ -469,7 +469,7 @@ xfs_attri_validate(
        unsigned int                    op = attrp->alfi_op_flags &
                                             XFS_ATTRI_OP_FLAGS_TYPE_MASK;
 
-       if (!xfs_sb_version_haslogxattrs(&mp->m_sb))
+       if (!xfs_is_using_logged_xattrs(mp))
                return false;
 
        if (attrp->__pad != 0)

diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index b2e5653b5200cb4ed3ea1dc1271bfaa7e243a7d1..09eef1721ef4f4f81454229aca90db235d5c1fec 100644 (file)
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -231,6 +231,13 @@ reread:
        mp->m_features |= xfs_sb_version_to_features(sbp);
        xfs_reinit_percpu_counters(mp);
 
+       /*
+        * If logged xattrs are enabled after log recovery finishes, then set
+        * the opstate so that log recovery will work properly.
+        */
+       if (xfs_sb_version_haslogxattrs(&mp->m_sb))
+               xfs_set_using_logged_xattrs(mp);
+
        /* no need to be quiet anymore, so reset the buf ops */
        bp->b_ops = &xfs_sb_buf_ops;
 
@@ -829,6 +836,15 @@ xfs_mountfs(
                goto out_inodegc_shrinker;
        }
 
+       /*
+        * If logged xattrs are still enabled after log recovery finishes, then
+        * they'll be available until unmount.  Otherwise, turn them off.
+        */
+       if (xfs_sb_version_haslogxattrs(&mp->m_sb))
+               xfs_set_using_logged_xattrs(mp);
+       else
+               xfs_clear_using_logged_xattrs(mp);
+
        /* Enable background inode inactivation workers. */
        xfs_inodegc_start(mp);
        xfs_blockgc_start(mp);

diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
index ca6f105990a2c3ca67020f946f4a7a82234dddfb..d0567dfbc0368df16f702b475865a2a5db6b96b3 100644 (file)
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
@@ -444,6 +444,8 @@ __XFS_HAS_FEAT(nouuid, NOUUID)
 #define XFS_OPSTATE_QUOTACHECK_RUNNING 10
 /* Do we want to clear log incompat flags? */
 #define XFS_OPSTATE_UNSET_LOG_INCOMPAT 11
+/* Filesystem can use logged extended attributes */
+#define XFS_OPSTATE_USE_LARP           12
 
 #define __XFS_IS_OPSTATE(name, NAME) \
 static inline bool xfs_is_ ## name (struct xfs_mount *mp) \
@@ -472,6 +474,7 @@ __XFS_IS_OPSTATE(quotacheck_running, QUOTACHECK_RUNNING)
 # define xfs_is_quotacheck_running(mp) (false)
 #endif
 __XFS_IS_OPSTATE(done_with_log_incompat, UNSET_LOG_INCOMPAT)
+__XFS_IS_OPSTATE(using_logged_xattrs, USE_LARP)
 
 static inline bool
 xfs_should_warn(struct xfs_mount *mp, long nr)
@@ -491,7 +494,8 @@ xfs_should_warn(struct xfs_mount *mp, long nr)
        { (1UL << XFS_OPSTATE_WARNED_SHRINK),           "wshrink" }, \
        { (1UL << XFS_OPSTATE_WARNED_LARP),             "wlarp" }, \
        { (1UL << XFS_OPSTATE_QUOTACHECK_RUNNING),      "quotacheck" }, \
-       { (1UL << XFS_OPSTATE_UNSET_LOG_INCOMPAT),      "unset_log_incompat" }
+       { (1UL << XFS_OPSTATE_UNSET_LOG_INCOMPAT),      "unset_log_incompat" }, \
+       { (1UL << XFS_OPSTATE_USE_LARP),                "logged_xattrs" }
 
 /*
  * Max and min values for mount-option defined I/O

diff --git a/fs/xfs/xfs_xattr.c b/fs/xfs/xfs_xattr.c
index 0cbb93cf2869c48dc386b6fd37163bd8331d4173..ba56a9e73144bf46793356fe0d08f3a9adf8acec 100644 (file)
--- a/fs/xfs/xfs_xattr.c
+++ b/fs/xfs/xfs_xattr.c
@@ -31,7 +31,7 @@ xfs_attr_grab_log_assist(
        int                     error = 0;
 
        /* xattr update log intent items are already enabled */
-       if (xfs_sb_version_haslogxattrs(&mp->m_sb))
+       if (xfs_is_using_logged_xattrs(mp))
                return 0;
 
        /*
@@ -48,6 +48,7 @@ xfs_attr_grab_log_assist(
                        XFS_SB_FEAT_INCOMPAT_LOG_XATTRS);
        if (error)
                return error;
+       xfs_set_using_logged_xattrs(mp);
 
        xfs_warn_mount(mp, XFS_OPSTATE_WARNED_LARP,
  "EXPERIMENTAL logged extended attributes feature in use. Use at your own risk!");