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 v14 02/14] xfsprogs: Add xfs_attr_node_remove_cleanup
Date: Fri, 18 Dec 2020 00:25:43 -0700	[thread overview]
Message-ID: <20201218072555.16694-3-allison.henderson@oracle.com> (raw)
In-Reply-To: <20201218072555.16694-1-allison.henderson@oracle.com>

Source kernel commit: 4078af18570ef0f89fce18e9ed9c1fa0c827f37b

This patch pulls a new helper function xfs_attr_node_remove_cleanup out
of xfs_attr_node_remove_step.  This helps to modularize
xfs_attr_node_remove_step which will help make the delayed attribute
code easier to follow

Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
---
 libxfs/xfs_attr.c | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index 3645398..5bed2e1 100644
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -1220,6 +1220,25 @@ xfs_attr_node_remove_rmt(
 	return xfs_attr_refillstate(state);
 }
 
+STATIC int
+xfs_attr_node_remove_cleanup(
+	struct xfs_da_args	*args,
+	struct xfs_da_state	*state)
+{
+	struct xfs_da_state_blk	*blk;
+	int			retval;
+
+	/*
+	 * Remove the name and update the hashvals in the tree.
+	 */
+	blk = &state->path.blk[state->path.active-1];
+	ASSERT(blk->magic == XFS_ATTR_LEAF_MAGIC);
+	retval = xfs_attr3_leaf_remove(blk->bp, args);
+	xfs_da3_fixhashpath(state, &state->path);
+
+	return retval;
+}
+
 /*
  * Remove a name from a B-tree attribute list.
  *
@@ -1232,7 +1251,6 @@ xfs_attr_node_remove_step(
 	struct xfs_da_args	*args,
 	struct xfs_da_state	*state)
 {
-	struct xfs_da_state_blk	*blk;
 	int			retval, error;
 	struct xfs_inode	*dp = args->dp;
 
@@ -1247,14 +1265,7 @@ xfs_attr_node_remove_step(
 		if (error)
 			return error;
 	}
-
-	/*
-	 * Remove the name and update the hashvals in the tree.
-	 */
-	blk = &state->path.blk[ state->path.active-1 ];
-	ASSERT(blk->magic == XFS_ATTR_LEAF_MAGIC);
-	retval = xfs_attr3_leaf_remove(blk->bp, args);
-	xfs_da3_fixhashpath(state, &state->path);
+	retval = xfs_attr_node_remove_cleanup(args, state);
 
 	/*
 	 * Check to see if the tree needs to be collapsed.
-- 
2.7.4


  parent reply	other threads:[~2020-12-18  7:28 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-18  7:25 [PATCH v14 00/14] xfsprogs: Delayed Attributes Allison Henderson
2020-12-18  7:25 ` [PATCH v14 01/14] xfsprogs: Add helper xfs_attr_node_remove_step Allison Henderson
2020-12-18  7:25 ` Allison Henderson [this message]
2020-12-18  7:25 ` [PATCH v14 03/14] xfsprogs: Hoist transaction handling in xfs_attr_node_remove_step Allison Henderson
2020-12-18  7:25 ` [PATCH v14 04/14] xfsprogs: Add delay ready attr remove routines Allison Henderson
2020-12-18  7:25 ` [PATCH v14 05/14] xfsprogs: Add delay ready attr set routines Allison Henderson
2020-12-18  7:25 ` [PATCH v14 06/14] xfsprogs: Add state machine tracepoints Allison Henderson
2020-12-18  7:25 ` [PATCH v14 07/14] xfsprogs: Rename __xfs_attr_rmtval_remove Allison Henderson
2020-12-18  7:25 ` [PATCH v14 08/14] xfsprogs: Set up infastructure for deferred attribute operations Allison Henderson
2020-12-18  7:25 ` [PATCH v14 09/14] xfsprogs: Skip flip flags for delayed attrs Allison Henderson
2020-12-18  7:25 ` [PATCH v14 10/14] xfsprogs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred Allison Henderson
2020-12-18  7:25 ` [PATCH v14 11/14] xfsprogs: Remove unused xfs_attr_*_args Allison Henderson
2020-12-18  7:25 ` [PATCH v14 12/14] xfsprogs: Add delayed attributes error tag Allison Henderson
2020-12-18  7:25 ` [PATCH v14 13/14] xfsprogs: Merge xfs_delattr_context into xfs_attr_item Allison Henderson
2020-12-18  7:25 ` [PATCH v14 14/14] xfsprogs: Add log item printing for ATTRI and ATTRD 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=20201218072555.16694-3-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.