From: Allison Collins <allison.henderson@oracle.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH v7 18/20] xfsprogs: Add helper function xfs_attr_leaf_mark_incomplete
Date: Sat, 22 Feb 2020 19:05:52 -0700 [thread overview]
Message-ID: <20200223020554.1731-19-allison.henderson@oracle.com> (raw)
In-Reply-To: <20200223020554.1731-1-allison.henderson@oracle.com>
This patch helps to simplify xfs_attr_node_removename by modularizing the code
around the transactions into helper functions. This will make the function easier
to follow when we introduce delayed attributes.
Signed-off-by: Allison Collins <allison.henderson@oracle.com>
---
libxfs/xfs_attr.c | 45 +++++++++++++++++++++++++++++++--------------
1 file changed, 31 insertions(+), 14 deletions(-)
diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index 0635d8b..1e6aba6 100644
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -1414,6 +1414,36 @@ xfs_attr_node_shrink(
}
/*
+ * Mark an attribute entry INCOMPLETE and save pointers to the relevant buffers
+ * for later deletion of the entry.
+ */
+STATIC int
+xfs_attr_leaf_mark_incomplete(
+ struct xfs_da_args *args,
+ struct xfs_da_state *state)
+{
+ int error;
+
+ /*
+ * Fill in disk block numbers in the state structure
+ * so that we can get the buffers back after we commit
+ * several transactions in the following calls.
+ */
+ error = xfs_attr_fillstate(state);
+ if (error)
+ return error;
+
+ /*
+ * Mark the attribute as INCOMPLETE
+ */
+ error = xfs_attr3_leaf_setflag(args);
+ if (error)
+ return error;
+
+ return 0;
+}
+
+/*
* Remove a name from a B-tree attribute list.
*
* This will involve walking down the Btree, and may involve joining
@@ -1471,20 +1501,7 @@ xfs_attr_node_removename(
args->dac.da_state = state;
if (args->rmtblkno > 0) {
- /*
- * Fill in disk block numbers in the state structure
- * so that we can get the buffers back after we commit
- * several transactions in the following calls.
- */
- error = xfs_attr_fillstate(state);
- if (error)
- goto out;
-
- /*
- * Mark the attribute as INCOMPLETE, then bunmapi() the
- * remote value.
- */
- error = xfs_attr3_leaf_setflag(args);
+ error = xfs_attr_leaf_mark_incomplete(args, state);
if (error)
goto out;
--
2.7.4
next prev parent reply other threads:[~2020-02-23 2:06 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-23 2:05 [PATCH v7 00/20] xfsprogs: Delayed Ready Attributes Allison Collins
2020-02-23 2:05 ` [PATCH v7 01/20] xfsprogs: Remove all strlen in all xfs_attr_* functions for attr names Allison Collins
2020-02-23 2:05 ` [PATCH v7 02/20] xfsprogs: Replace attribute parameters with struct xfs_name Allison Collins
2020-02-23 2:05 ` [PATCH v7 03/20] xfsprogs: Embed struct xfs_name in xfs_da_args Allison Collins
2020-02-23 2:05 ` [PATCH v7 04/20] xfsprogs: Add xfs_has_attr and subroutines Allison Collins
2020-02-23 2:05 ` [PATCH v7 05/20] xfsprogs: Check for -ENOATTR or -EEXIST Allison Collins
2020-02-23 2:05 ` [PATCH v7 06/20] xfsprogs: Factor out new helper functions xfs_attr_rmtval_set Allison Collins
2020-02-23 2:05 ` [PATCH v7 07/20] xfsprogs: Factor out trans handling in xfs_attr3_leaf_flipflags Allison Collins
2020-02-23 2:05 ` [PATCH v7 08/20] xfsprogs: Factor out xfs_attr_leaf_addname helper Allison Collins
2020-02-23 2:05 ` [PATCH v7 09/20] xfsprogs: Refactor xfs_attr_try_sf_addname Allison Collins
2020-02-23 2:05 ` [PATCH v7 10/20] xfsprogs: Factor out trans roll from xfs_attr3_leaf_setflag Allison Collins
2020-02-23 2:05 ` [PATCH v7 11/20] xfsprogs: Factor out xfs_attr_rmtval_invalidate Allison Collins
2020-02-23 2:05 ` [PATCH v7 12/20] xfsprogs: Factor out trans roll in xfs_attr3_leaf_clearflag Allison Collins
2020-02-23 2:05 ` [PATCH v7 13/20] xfsprogs: Add helper function xfs_attr_rmtval_unmap Allison Collins
2020-02-23 2:05 ` [PATCH v7 14/20] xfsprogs: Add delay ready attr remove routines Allison Collins
2020-02-23 2:05 ` [PATCH v7 15/20] xfsprogs: Add delay ready attr set routines Allison Collins
2020-02-23 2:05 ` [PATCH v7 16/20] xfsprogs: Add helper function xfs_attr_node_shrink Allison Collins
2020-02-23 2:05 ` [PATCH v7 17/20] xfsprogs: Simplify xfs_attr_set_iter Allison Collins
2020-02-23 2:05 ` Allison Collins [this message]
2020-02-23 2:05 ` [PATCH v7 19/20] xfsprogs: Add remote block helper functions Allison Collins
2020-02-23 2:05 ` [PATCH v7 20/20] xfsprogs: Remove xfs_attr_rmtval_remove Allison Collins
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=20200223020554.1731-19-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.