All of lore.kernel.org
 help / color / mirror / Atom feed
From: Allison Henderson <allison.henderson@oracle.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH v15 33/37] xfsprogs: Skip flip flags for delayed attrs
Date: Thu, 18 Feb 2021 09:45:08 -0700	[thread overview]
Message-ID: <20210218164512.4659-34-allison.henderson@oracle.com> (raw)
In-Reply-To: <20210218164512.4659-1-allison.henderson@oracle.com>

Source kernel commit: 2b1c81a8c3f453ba16b6db8dae256723bf53c051

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>
---
 libxfs/xfs_attr.c      | 51 +++++++++++++++++++++++++++++---------------------
 libxfs/xfs_attr_leaf.c |  3 ++-
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index 28212da..3f81b3e 100644
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -337,6 +337,7 @@ xfs_attr_set_iter(
 	struct xfs_da_state		*state = NULL;
 	int				forkoff, error = 0;
 	int				retval = 0;
+	struct xfs_mount		*mp = args->dp->i_mount;
 
 	/* State machine switch */
 	switch (dac->dela_state) {
@@ -470,16 +471,21 @@ xfs_attr_set_iter(
 		 * "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_hasdelattr(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
@@ -588,17 +594,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_hasdelattr(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
@@ -1290,7 +1300,6 @@ int xfs_attr_node_addname_work(
 	 * 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;
 	state = xfs_da_state_alloc(args);
 	state->inleaf = 0;
 	error = xfs_da3_node_lookup_int(state, &retval);
diff --git a/libxfs/xfs_attr_leaf.c b/libxfs/xfs_attr_leaf.c
index 2c7aa6b..9837bd5 100644
--- a/libxfs/xfs_attr_leaf.c
+++ b/libxfs/xfs_attr_leaf.c
@@ -1483,7 +1483,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_hasdelattr(mp))
+			entry->flags |= XFS_ATTR_INCOMPLETE;
 		if ((args->blkno2 == args->blkno) &&
 		    (args->index2 <= args->index)) {
 			args->index2++;
-- 
2.7.4


  parent reply	other threads:[~2021-02-18 18:47 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-18 16:44 [PATCH v15 00/37] xfsprogs: Delayed Attributes Allison Henderson
2021-02-18 16:44 ` [PATCH v15 01/37] xfsprogs: fix an ABBA deadlock in xfs_rename Allison Henderson
2021-02-18 16:44 ` [PATCH v15 02/37] xfsprogs: Add helper for checking per-inode extent count overflow Allison Henderson
2021-02-18 16:44 ` [PATCH v15 03/37] xfsprogs: Check for extent overflow when trivally adding a new extent Allison Henderson
2021-02-18 16:44 ` [PATCH v15 04/37] xfsprogs: Check for extent overflow when punching a hole Allison Henderson
2021-02-18 16:44 ` [PATCH v15 05/37] xfsprogs: Check for extent overflow when adding dir entries Allison Henderson
2021-02-18 16:44 ` [PATCH v15 06/37] xfsprogs: Check for extent overflow when removing " Allison Henderson
2021-02-18 16:44 ` [PATCH v15 07/37] xfsprogs: Check for extent overflow when renaming " Allison Henderson
2021-02-18 16:44 ` [PATCH v15 08/37] xfsprogs: Check for extent overflow when adding/removing xattrs Allison Henderson
2021-02-18 16:44 ` [PATCH v15 09/37] xfsprogs: Check for extent overflow when writing to unwritten extent Allison Henderson
2021-02-18 16:44 ` [PATCH v15 10/37] xfsprogs: Check for extent overflow when moving extent from cow to data fork Allison Henderson
2021-02-18 16:44 ` [PATCH v15 11/37] xfsprogs: Check for extent overflow when swapping extents Allison Henderson
2021-02-18 16:44 ` [PATCH v15 12/37] xfsprogs: Introduce error injection to reduce maximum inode fork extent count Allison Henderson
2021-02-18 16:44 ` [PATCH v15 13/37] xfsprogs: Remove duplicate assert statement in xfs_bmap_btalloc() Allison Henderson
2021-02-18 16:44 ` [PATCH v15 14/37] xfsprogs: Compute bmap extent alignments in a separate function Allison Henderson
2021-02-18 16:44 ` [PATCH v15 15/37] xfsprogs: Process allocated extent " Allison Henderson
2021-02-18 16:44 ` [PATCH v15 16/37] xfsprogs: Introduce error injection to allocate only minlen size extents for files Allison Henderson
2021-02-18 16:44 ` [PATCH v15 17/37] libxfs: expose inobtcount in xfs geometry Allison Henderson
2021-02-18 16:44 ` [PATCH v15 18/37] xfsprogs: Add helper xfs_attr_node_remove_step Allison Henderson
2021-02-18 16:44 ` [PATCH v15 19/37] xfsprogs: Add xfs_attr_node_remove_cleanup Allison Henderson
2021-02-18 16:44 ` [PATCH v15 20/37] xfsprogs: Hoist transaction handling in xfs_attr_node_remove_step Allison Henderson
2021-02-18 16:44 ` [PATCH v15 21/37] xfsprogs: Hoist xfs_attr_set_shortform Allison Henderson
2021-02-18 16:44 ` [PATCH v15 22/37] xfsprogs: Add helper xfs_attr_set_fmt Allison Henderson
2021-02-18 16:44 ` [PATCH v15 23/37] xfsprogs: Separate xfs_attr_node_addname and xfs_attr_node_addname_work Allison Henderson
2021-02-18 16:44 ` [PATCH v15 24/37] xfsprogs: Add helper xfs_attr_node_addname_find_attr Allison Henderson
2021-02-18 16:45 ` [PATCH v15 25/37] xfsprogs: Hoist xfs_attr_node_addname Allison Henderson
2021-02-18 16:45 ` [PATCH v15 26/37] xfsprogs: Hoist xfs_attr_leaf_addname Allison Henderson
2021-02-18 16:45 ` [PATCH v15 27/37] xfsprogs: Hoist node transaction handling Allison Henderson
2021-02-18 16:45 ` [PATCH v15 28/37] xfsprogs: Add delay ready attr remove routines Allison Henderson
2021-02-18 16:45 ` [PATCH v15 29/37] xfsprogs: Add delay ready attr set routines Allison Henderson
2021-02-18 16:45 ` [PATCH v15 30/37] xfsprogs: Add state machine tracepoints Allison Henderson
2021-02-18 16:45 ` [PATCH v15 31/37] xfsprogs: Rename __xfs_attr_rmtval_remove Allison Henderson
2021-02-18 16:45 ` [PATCH v15 32/37] xfsprogs: Set up infastructure for deferred attribute operations Allison Henderson
2021-02-18 16:45 ` Allison Henderson [this message]
2021-02-18 16:45 ` [PATCH v15 34/37] xfsprogs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred Allison Henderson
2021-02-18 16:45 ` [PATCH v15 35/37] xfsprogs: Remove unused xfs_attr_*_args Allison Henderson
2021-02-18 16:45 ` [PATCH v15 36/37] xfsprogs: Add delayed attributes error tag Allison Henderson
2021-02-18 16:45 ` [PATCH v15 37/37] xfsprogs: Merge xfs_delattr_context into xfs_attr_item Allison Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210218164512.4659-34-allison.henderson@oracle.com \
    --to=allison.henderson@oracle.com \
    --cc=linux-xfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.