xfs: refactor xfs_is_using_logged_xattrs checks in attr item recovery

Move this feature check down to the per-op checks so that we can ensure
that we never see parent pointer attr items on non-pptr filesystems, and
that logged xattrs are turned on for non-pptr attr items.

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 4a57bcff49ebded95ad8f4c679274ddcd25c73b2..413e3d3959a5da8d8454168b1f1bce1d3094337b 100644 (file)
--- a/fs/xfs/xfs_attr_item.c
+++ b/fs/xfs/xfs_attr_item.c
@@ -480,9 +480,6 @@ xfs_attri_validate(
 {
        unsigned int                    op = xfs_attr_log_item_op(attrp);
 
-       if (!xfs_is_using_logged_xattrs(mp))
-               return false;
-
        if (attrp->__pad != 0)
                return false;
 
@@ -499,12 +496,16 @@ xfs_attri_validate(
        switch (op) {
        case XFS_ATTRI_OP_FLAGS_SET:
        case XFS_ATTRI_OP_FLAGS_REPLACE:
+               if (!xfs_is_using_logged_xattrs(mp))
+                       return false;
                if (attrp->alfi_value_len > XATTR_SIZE_MAX)
                        return false;
                if (!xfs_attri_validate_namelen(attrp->alfi_name_len))
                        return false;
                break;
        case XFS_ATTRI_OP_FLAGS_REMOVE:
+               if (!xfs_is_using_logged_xattrs(mp))
+                       return false;
                if (attrp->alfi_value_len != 0)
                        return false;
                if (!xfs_attri_validate_namelen(attrp->alfi_name_len))