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 v22 08/27] xfsprogs: Hoist node transaction handling
Date: Mon, 26 Jul 2021 23:18:45 -0700	[thread overview]
Message-ID: <20210727061904.11084-9-allison.henderson@oracle.com> (raw)
In-Reply-To: <20210727061904.11084-1-allison.henderson@oracle.com>

Source kernel commit: cb9e8e1fb89d84c77c8035b2391359f9cbf209e6

This patch basically hoists the node transaction handling around the
leaf code we just hoisted.  This will helps setup this area for the
state machine since the goto is easily replaced with a state since it
ends with a transaction roll.

Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
---
 libxfs/xfs_attr.c | 55 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index 9dc518a..118ec0b4 100644
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -309,10 +309,36 @@ xfs_attr_set_args(
 
 	if (xfs_attr_is_leaf(dp)) {
 		error = xfs_attr_leaf_try_add(args, bp);
-		if (error == -ENOSPC)
+		if (error == -ENOSPC) {
+			/*
+			 * Promote the attribute list to the Btree format.
+			 */
+			error = xfs_attr3_leaf_to_node(args);
+			if (error)
+				return error;
+
+			/*
+			 * Finish any deferred work items and roll the transaction once
+			 * more.  The goal here is to call node_addname with the inode
+			 * and transaction in the same state (inode locked and joined,
+			 * transaction clean) no matter how we got to this step.
+			 */
+			error = xfs_defer_finish(&args->trans);
+			if (error)
+				return error;
+
+			/*
+			 * Commit the current trans (including the inode) and
+			 * start a new one.
+			 */
+			error = xfs_trans_roll_inode(&args->trans, dp);
+			if (error)
+				return error;
+
 			goto node;
-		else if (error)
+		} else if (error) {
 			return error;
+		}
 
 		/*
 		 * Commit the transaction that added the attr name so that
@@ -402,32 +428,9 @@ xfs_attr_set_args(
 			/* bp is gone due to xfs_da_shrink_inode */
 
 		return error;
+	}
 node:
-		/*
-		 * Promote the attribute list to the Btree format.
-		 */
-		error = xfs_attr3_leaf_to_node(args);
-		if (error)
-			return error;
-
-		/*
-		 * Finish any deferred work items and roll the transaction once
-		 * more.  The goal here is to call node_addname with the inode
-		 * and transaction in the same state (inode locked and joined,
-		 * transaction clean) no matter how we got to this step.
-		 */
-		error = xfs_defer_finish(&args->trans);
-		if (error)
-			return error;
 
-		/*
-		 * Commit the current trans (including the inode) and
-		 * start a new one.
-		 */
-		error = xfs_trans_roll_inode(&args->trans, dp);
-		if (error)
-			return error;
-	}
 
 	do {
 		error = xfs_attr_node_addname_find_attr(args, &state);
-- 
2.7.4


  parent reply	other threads:[~2021-07-27  6:19 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-27  6:18 [PATCH v22 00/27] Delayed Attributes Allison Henderson
2021-07-27  6:18 ` [PATCH v22 01/27] xfsprogs: Reverse apply 72b97ea40d Allison Henderson
2021-07-27  6:18 ` [PATCH v22 02/27] xfsprogs: Add xfs_attr_node_remove_name Allison Henderson
2021-07-27  6:18 ` [PATCH v22 03/27] xfsprogs: Refactor xfs_attr_set_shortform Allison Henderson
2021-07-27  6:18 ` [PATCH v22 04/27] xfsprogs: Separate xfs_attr_node_addname and xfs_attr_node_addname_clear_incomplete Allison Henderson
2021-07-27  6:18 ` [PATCH v22 05/27] xfsprogs: Add helper xfs_attr_node_addname_find_attr Allison Henderson
2021-07-27  6:18 ` [PATCH v22 06/27] xfsprogs: Hoist xfs_attr_node_addname Allison Henderson
2021-07-27  6:18 ` [PATCH v22 07/27] xfsprogs: Hoist xfs_attr_leaf_addname Allison Henderson
2021-07-27  6:18 ` Allison Henderson [this message]
2021-07-27  6:18 ` [PATCH v22 09/27] xfsprogs: Add delay ready attr remove routines Allison Henderson
2021-07-27  6:18 ` [PATCH v22 10/27] xfsprogs: Add delay ready attr set routines Allison Henderson
2021-07-27  6:18 ` [PATCH v22 11/27] xfsprogs: Remove xfs_attr_rmtval_set Allison Henderson
2021-07-27  6:18 ` [PATCH v22 12/27] xfsprogs: Clean up xfs_attr_node_addname_clear_incomplete Allison Henderson
2021-07-27  6:18 ` [PATCH v22 13/27] xfsprogs: Fix default ASSERT in xfs_attr_set_iter Allison Henderson
2021-07-27  6:18 ` [PATCH v22 14/27] xfsprogs: Make attr name schemes consistent Allison Henderson
2021-07-27  6:18 ` [PATCH v22 15/27] xfs: allow setting and clearing of log incompat feature flags Allison Henderson
2021-07-27  6:18 ` [PATCH v22 16/27] xfsprogs: Return from xfs_attr_set_iter if there are no more rmtblks to process Allison Henderson
2021-07-27  6:18 ` [PATCH v22 17/27] xfsprogs: Add state machine tracepoints Allison Henderson
2021-07-27  6:18 ` [PATCH v22 18/27] xfsprogs: Rename __xfs_attr_rmtval_remove Allison Henderson
2021-07-27  6:18 ` [PATCH v22 19/27] xfsprogs: Set up infrastructure for deferred attribute operations Allison Henderson
2021-07-27  6:18 ` [PATCH v22 20/27] xfsprogs: Implement attr logging and replay Allison Henderson
2021-07-27  6:18 ` [PATCH v22 21/27] RFC xfsprogs: Skip flip flags for delayed attrs Allison Henderson
2021-07-27  6:18 ` [PATCH v22 22/27] xfsprogs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred Allison Henderson
2021-07-27  6:19 ` [PATCH v22 23/27] xfsprogs: Remove unused xfs_attr_*_args Allison Henderson
2021-07-27  6:19 ` [PATCH v22 24/27] xfsprogs: Add delayed attributes error tag Allison Henderson
2021-07-27  6:19 ` [PATCH v22 25/27] xfsprogs: Merge xfs_delattr_context into xfs_attr_item Allison Henderson
2021-07-27  6:19 ` [PATCH v22 26/27] xfsprogs: Add helper function xfs_attr_leaf_addname Allison Henderson
2021-07-27  6:19 ` [PATCH v22 27/27] xfsprogs: Add log item printing for ATTRI and ATTRD Allison Henderson
2021-07-28 19:41   ` Darrick J. Wong

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=20210727061904.11084-9-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.