xfs: Skip flip flags for delayed attrs

This is a clean up patch that skips the flip flag logic for delayed attr
renames.  Since the log replay keeps the inode locked, we do not need to
worry about race windows with attr lookups.  So we can skip over
flipping the flag and the extra transaction roll for it

Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index e22884fb6f00e84a09098aa8701330ce8b118f53..f5e74837b3de47f6cf462496199b13f0a5b4a30b 100644 (file)
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -358,6 +358,7 @@ xfs_attr_set_iter(
        struct xfs_inode                *dp = args->dp;
        struct xfs_buf                  *bp = NULL;
        int                             forkoff, error = 0;
+       struct xfs_mount                *mp = args->dp->i_mount;
 
        /* State machine switch */
        switch (dac->dela_state) {
@@ -480,16 +481,21 @@ xfs_attr_set_iter(
                 * In a separate transaction, set the incomplete flag on the
                 * "old" attr and clear the incomplete flag on the "new" attr.
                 */
-               error = xfs_attr3_leaf_flipflags(args);
-               if (error)
-                       return error;
-               /*
-                * Commit the flag value change and start the next trans in
-                * series.
-                */
-               dac->dela_state = XFS_DAS_FLIP_LFLAG;
-               trace_xfs_attr_set_iter_return(dac->dela_state, args->dp);
-               return -EAGAIN;
+               if (!xfs_has_larp(mp)) {
+                       error = xfs_attr3_leaf_flipflags(args);
+                       if (error)
+                               return error;
+                       /*
+                        * Commit the flag value change and start the next trans
+                        * in series.
+                        */
+                       dac->dela_state = XFS_DAS_FLIP_LFLAG;
+                       trace_xfs_attr_set_iter_return(dac->dela_state,
+                                                      args->dp);
+                       return -EAGAIN;
+               }
+
+               fallthrough;
        case XFS_DAS_FLIP_LFLAG:
                /*
                 * Dismantle the "old" attribute/value pair by removing a
@@ -592,17 +598,21 @@ xfs_attr_set_iter(
                 * In a separate transaction, set the incomplete flag on the
                 * "old" attr and clear the incomplete flag on the "new" attr.
                 */
-               error = xfs_attr3_leaf_flipflags(args);
-               if (error)
-                       goto out;
-               /*
-                * Commit the flag value change and start the next trans in
-                * series
-                */
-               dac->dela_state = XFS_DAS_FLIP_NFLAG;
-               trace_xfs_attr_set_iter_return(dac->dela_state, args->dp);
-               return -EAGAIN;
+               if (!xfs_has_larp(mp)) {
+                       error = xfs_attr3_leaf_flipflags(args);
+                       if (error)
+                               goto out;
+                       /*
+                        * Commit the flag value change and start the next trans
+                        * in series
+                        */
+                       dac->dela_state = XFS_DAS_FLIP_NFLAG;
+                       trace_xfs_attr_set_iter_return(dac->dela_state,
+                                                      args->dp);
+                       return -EAGAIN;
+               }
 
+               fallthrough;
        case XFS_DAS_FLIP_NFLAG:
                /*
                 * Dismantle the "old" attribute/value pair by removing a
@@ -1273,6 +1283,7 @@ xfs_attr_node_addname_clear_incomplete(
 {
        struct xfs_da_args              *args = dac->da_args;
        struct xfs_da_state             *state = NULL;
+       struct xfs_mount                *mp = args->dp->i_mount;
        int                             retval = 0;
        int                             error = 0;
 
@@ -1280,7 +1291,8 @@ xfs_attr_node_addname_clear_incomplete(
         * Re-find the "old" attribute entry after any split ops. The INCOMPLETE
         * flag means that we will find the "old" attr, not the "new" one.
         */
-       args->attr_filter |= XFS_ATTR_INCOMPLETE;
+       if (!xfs_has_larp(mp))
+               args->attr_filter |= XFS_ATTR_INCOMPLETE;
        state = xfs_da_state_alloc(args);
        state->inleaf = 0;
        error = xfs_da3_node_lookup_int(state, &retval);

diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c
index 014daa8c542d6635356dd8ff0bef7e7552a290e2..74b76b09509f0de062147f7e6373c6915cec014e 100644 (file)
--- a/fs/xfs/libxfs/xfs_attr_leaf.c
+++ b/fs/xfs/libxfs/xfs_attr_leaf.c
@@ -1487,7 +1487,8 @@ xfs_attr3_leaf_add_work(
        if (tmp)
                entry->flags |= XFS_ATTR_LOCAL;
        if (args->op_flags & XFS_DA_OP_RENAME) {
-               entry->flags |= XFS_ATTR_INCOMPLETE;
+               if (!xfs_has_larp(mp))
+                       entry->flags |= XFS_ATTR_INCOMPLETE;
                if ((args->blkno2 == args->blkno) &&
                    (args->index2 <= args->index)) {
                        args->index2++;