From: Allison Henderson <allison.henderson@oracle.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH v13 03/14] xfsprogs: Add helper xfs_attr_node_remove_step
Date: Thu, 22 Oct 2020 23:32:55 -0700 [thread overview]
Message-ID: <20201023063306.7441-4-allison.henderson@oracle.com> (raw)
In-Reply-To: <20201023063306.7441-1-allison.henderson@oracle.com>
From: Allison Collins <allison.henderson@oracle.com>
Source kernel commit: 5e2aff99f8f0b7ff511b7bbd1213743f59806878
This patch adds a new helper function xfs_attr_node_remove_step. This
will help simplify and modularize the calling function
xfs_attr_node_remove.
Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
---
libxfs/xfs_attr.c | 46 ++++++++++++++++++++++++++++++++++------------
1 file changed, 34 insertions(+), 12 deletions(-)
diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index 1c1092f..1bf71dc 100644
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -1220,19 +1220,14 @@ xfs_attr_node_remove_rmt(
* the root node (a special case of an intermediate node).
*/
STATIC int
-xfs_attr_node_removename(
- struct xfs_da_args *args)
+xfs_attr_node_remove_step(
+ struct xfs_da_args *args,
+ struct xfs_da_state *state)
{
- struct xfs_da_state *state;
struct xfs_da_state_blk *blk;
int retval, error;
struct xfs_inode *dp = args->dp;
- trace_xfs_attr_node_removename(args);
-
- error = xfs_attr_node_removename_setup(args, &state);
- if (error)
- goto out;
/*
* If there is an out-of-line value, de-allocate the blocks.
@@ -1242,7 +1237,7 @@ xfs_attr_node_removename(
if (args->rmtblkno > 0) {
error = xfs_attr_node_remove_rmt(args, state);
if (error)
- goto out;
+ return error;
}
/*
@@ -1259,18 +1254,45 @@ xfs_attr_node_removename(
if (retval && (state->path.active > 1)) {
error = xfs_da3_join(state);
if (error)
- goto out;
+ return error;
error = xfs_defer_finish(&args->trans);
if (error)
- goto out;
+ return error;
/*
* Commit the Btree join operation and start a new trans.
*/
error = xfs_trans_roll_inode(&args->trans, dp);
if (error)
- goto out;
+ return error;
}
+ return error;
+}
+
+/*
+ * Remove a name from a B-tree attribute list.
+ *
+ * This routine will find the blocks of the name to remove, remove them and
+ * shirnk the tree if needed.
+ */
+STATIC int
+xfs_attr_node_removename(
+ struct xfs_da_args *args)
+{
+ struct xfs_da_state *state;
+ int error;
+ struct xfs_inode *dp = args->dp;
+
+ trace_xfs_attr_node_removename(args);
+
+ error = xfs_attr_node_removename_setup(args, &state);
+ if (error)
+ goto out;
+
+ error = xfs_attr_node_remove_step(args, state);
+ if (error)
+ goto out;
+
/*
* If the result is small enough, push it all into the inode.
*/
--
2.7.4
next prev parent reply other threads:[~2020-10-23 6:35 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-23 6:32 [PATCH v13 00/14] xfsprogs: Delayed Attributes Allison Henderson
2020-10-23 6:32 ` [PATCH v13 01/14] xfs: store inode btree block counts in AGI header Allison Henderson
2020-10-23 6:32 ` [PATCH v13 02/14] xfs: enable new inode btree counters feature Allison Henderson
2020-10-23 6:32 ` Allison Henderson [this message]
2020-10-23 6:32 ` [PATCH v13 04/14] xfsprogs: Add delay ready attr remove routines Allison Henderson
2020-10-23 6:32 ` [PATCH v13 05/14] xfsprogs: Add delay ready attr set routines Allison Henderson
2020-10-23 6:32 ` [PATCH v13 06/14] xfsprogs: Rename __xfs_attr_rmtval_remove Allison Henderson
2020-10-23 6:32 ` [PATCH v13 07/14] xfsprogs: Set up infastructure for deferred attribute operations Allison Henderson
2020-10-23 6:33 ` [PATCH v13 08/14] xfsprogs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred Allison Henderson
2020-10-23 6:33 ` [PATCH v13 09/14] xfsprogs: Add feature bit XFS_SB_FEAT_INCOMPAT_LOG_DELATTR Allison Henderson
2020-10-23 6:33 ` [PATCH v13 10/14] xfsprogs: Enable delayed attributes Allison Henderson
2020-10-23 6:33 ` [PATCH v13 11/14] xfsprogs: Remove unused xfs_attr_*_args Allison Henderson
2020-10-23 6:33 ` [PATCH v13 12/14] xfs_io: Add delayed attributes error tag Allison Henderson
2020-10-23 6:33 ` [PATCH v13 13/14] [RFC] xfsprogs: Add log item printing for ATTRI and ATTRD Allison Henderson
2020-11-10 23:52 ` Darrick J. Wong
2020-11-13 3:57 ` Allison Henderson
2020-10-23 6:33 ` [PATCH v13 14/14] xfsprogs: Add delayed attribute flag to cmd Allison Henderson
2020-11-10 23:48 ` Darrick J. Wong
2020-11-13 3:52 ` 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=20201023063306.7441-4-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox