From: Allison Collins <allison.henderson@oracle.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH v8 30/39] xfsprogs: Add helper function xfs_attr_node_shrink
Date: Fri, 3 Apr 2020 15:09:49 -0700 [thread overview]
Message-ID: <20200403220958.4944-31-allison.henderson@oracle.com> (raw)
In-Reply-To: <20200403220958.4944-1-allison.henderson@oracle.com>
This patch adds a new helper function xfs_attr_node_shrink used to
shrink an attr name into an inode if it is small enough. This helps to
modularize the greater calling function xfs_attr_node_removename.
Signed-off-by: Allison Collins <allison.henderson@oracle.com>
---
libxfs/xfs_attr.c | 67 ++++++++++++++++++++++++++++++++++---------------------
1 file changed, 42 insertions(+), 25 deletions(-)
diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index 3bb3b19..301487f 100644
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -1104,6 +1104,45 @@ out:
}
/*
+ * Shrink an attribute from leaf to shortform
+ */
+STATIC int
+xfs_attr_node_shrink(
+ struct xfs_da_args *args,
+ struct xfs_da_state *state)
+{
+ struct xfs_inode *dp = args->dp;
+ int error, forkoff;
+ struct xfs_buf *bp;
+
+ /*
+ * Have to get rid of the copy of this dabuf in the state.
+ */
+ ASSERT(state->path.active == 1);
+ ASSERT(state->path.blk[0].bp);
+ state->path.blk[0].bp = NULL;
+
+ error = xfs_attr3_leaf_read(args->trans, args->dp, 0, &bp);
+ if (error)
+ return error;
+
+ forkoff = xfs_attr_shortform_allfit(bp, dp);
+ if (forkoff) {
+ error = xfs_attr3_leaf_to_shortform(bp, args, forkoff);
+ /* bp is gone due to xfs_da_shrink_inode */
+ if (error)
+ return error;
+
+ error = xfs_defer_finish(&args->trans);
+ if (error)
+ return error;
+ } else
+ xfs_trans_brelse(args->trans, bp);
+
+ return 0;
+}
+
+/*
* Remove a name from a B-tree attribute list.
*
* This will involve walking down the Btree, and may involve joining
@@ -1116,8 +1155,7 @@ xfs_attr_node_removename(
{
struct xfs_da_state *state;
struct xfs_da_state_blk *blk;
- struct xfs_buf *bp;
- int retval, error, forkoff;
+ int retval, error;
struct xfs_inode *dp = args->dp;
trace_xfs_attr_node_removename(args);
@@ -1198,31 +1236,10 @@ xfs_attr_node_removename(
/*
* If the result is small enough, push it all into the inode.
*/
- if (xfs_bmap_one_block(dp, XFS_ATTR_FORK)) {
- /*
- * Have to get rid of the copy of this dabuf in the state.
- */
- ASSERT(state->path.active == 1);
- ASSERT(state->path.blk[0].bp);
- state->path.blk[0].bp = NULL;
-
- error = xfs_attr3_leaf_read(args->trans, args->dp, 0, &bp);
- if (error)
- goto out;
+ if (xfs_bmap_one_block(dp, XFS_ATTR_FORK))
+ error = xfs_attr_node_shrink(args, state);
- if ((forkoff = xfs_attr_shortform_allfit(bp, dp))) {
- error = xfs_attr3_leaf_to_shortform(bp, args, forkoff);
- /* bp is gone due to xfs_da_shrink_inode */
- if (error)
- goto out;
- error = xfs_defer_finish(&args->trans);
- if (error)
- goto out;
- } else
- xfs_trans_brelse(args->trans, bp);
- }
error = 0;
-
out:
if (state)
xfs_da_state_free(state);
--
2.7.4
next prev parent reply other threads:[~2020-04-03 22:12 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-03 22:09 [PATCH v8 00/39] xfsprogs: Delay Ready Attributes Allison Collins
2020-04-03 22:09 ` [PATCH v8 01/39] xfsprogs: remove the ATTR_INCOMPLETE flag Allison Collins
2020-04-03 22:09 ` [PATCH v8 02/39] xfsprogs: merge xfs_attr_remove into xfs_attr_set Allison Collins
2020-04-03 22:09 ` [PATCH v8 03/39] xfsprogs: remove the name == NULL check from xfs_attr_args_init Allison Collins
2020-04-03 22:09 ` [PATCH v8 04/39] xfsprogs: remove the MAXNAMELEN " Allison Collins
2020-04-03 22:09 ` [PATCH v8 05/39] xfsprogs: turn xfs_da_args.value into a void pointer Allison Collins
2020-04-03 22:09 ` [PATCH v8 06/39] xfsprogs: pass an initialized xfs_da_args structure to xfs_attr_set Allison Collins
2020-04-03 22:09 ` [PATCH v8 07/39] xfsprogs: pass an initialized xfs_da_args to xfs_attr_get Allison Collins
2020-04-03 22:09 ` [PATCH v8 08/39] xfsprogs: remove the xfs_inode argument to xfs_attr_get_ilocked Allison Collins
2020-04-03 22:09 ` [PATCH v8 09/39] xfsprogs: remove ATTR_KERNOVAL Allison Collins
2020-04-03 22:09 ` [PATCH v8 10/39] xfsprogs: remove ATTR_ALLOC and XFS_DA_OP_ALLOCVAL Allison Collins
2020-04-03 22:09 ` [PATCH v8 11/39] xfsprogs: replace ATTR_KERNOTIME with XFS_DA_OP_NOTIME Allison Collins
2020-04-03 22:09 ` [PATCH v8 12/39] xfsprogs: factor out a xfs_attr_match helper Allison Collins
2020-04-03 22:09 ` [PATCH v8 13/39] xfsprogs: cleanup struct xfs_attr_list_context Allison Collins
2020-04-03 22:09 ` [PATCH v8 14/39] xfsprogs: remove the unused ATTR_ENTRY macro Allison Collins
2020-04-03 22:09 ` [PATCH v8 15/39] xfsprogs: move the legacy xfs_attr_list to xfs_ioctl.c Allison Collins
2020-04-03 22:09 ` [PATCH v8 16/39] xfsprogs: rename xfs_attr_list_int to xfs_attr_list Allison Collins
2020-04-03 22:09 ` [PATCH v8 17/39] xfsprogs: clean up the ATTR_REPLACE checks Allison Collins
2020-04-03 22:09 ` [PATCH v8 18/39] xfsprogs: clean up the attr flag confusion Allison Collins
2020-04-03 22:09 ` [PATCH v8 19/39] xfsprogs: embedded the attrlist cursor into struct xfs_attr_list_context Allison Collins
2020-04-03 22:09 ` [PATCH v8 20/39] xfsprogs: Add xfs_has_attr and subroutines Allison Collins
2020-04-03 22:09 ` [PATCH v8 21/39] xfsprogs: Check for -ENOATTR or -EEXIST Allison Collins
2020-04-03 22:09 ` [PATCH v8 22/39] xfsprogs: Factor out new helper functions xfs_attr_rmtval_set Allison Collins
2020-04-03 22:09 ` [PATCH v8 23/39] xfsprogs: Pull up trans handling in xfs_attr3_leaf_flipflags Allison Collins
2020-04-03 22:09 ` [PATCH v8 24/39] xfsprogs: Split apart xfs_attr_leaf_addname Allison Collins
2020-04-03 22:09 ` [PATCH v8 25/39] xfsprogs: Refactor xfs_attr_try_sf_addname Allison Collins
2020-04-03 22:09 ` [PATCH v8 26/39] xfsprogs: Pull up trans roll from xfs_attr3_leaf_setflag Allison Collins
2020-04-03 22:09 ` [PATCH v8 27/39] xfsprogs: Factor out xfs_attr_rmtval_invalidate Allison Collins
2020-04-03 22:09 ` [PATCH v8 28/39] xfsprogs: Pull up trans roll in xfs_attr3_leaf_clearflag Allison Collins
2020-04-03 22:09 ` [PATCH v8 29/39] xfsprogs: Add helper function __xfs_attr_rmtval_remove Allison Collins
2020-04-03 22:09 ` Allison Collins [this message]
2020-04-03 22:09 ` [PATCH v8 31/39] xfsprogs: Removed unneeded xfs_trans_roll_inode calls Allison Collins
2020-04-03 22:09 ` [PATCH v8 32/39] xfsprogs: Add helpers xfs_attr_is_shortform and xfs_attr_set_shortform Allison Collins
2020-04-03 22:09 ` [PATCH v8 33/39] xfsprogs: Add helper function xfs_attr_leaf_mark_incomplete Allison Collins
2020-04-03 22:09 ` [PATCH v8 34/39] xfsprogs: Add remote block helper functions Allison Collins
2020-04-03 22:09 ` [PATCH v8 35/39] xfsprogs: Add helper function xfs_attr_node_removename_setup Allison Collins
2020-04-03 22:09 ` [PATCH v8 36/39] xfsprogs: Add helper function xfs_attr_node_removename_rmt Allison Collins
2020-04-03 22:09 ` [PATCH v8 37/39] xfsprogs: Add delay ready attr remove routines Allison Collins
2020-04-03 22:09 ` [PATCH v8 38/39] xfsprogs: Add delay ready attr set routines Allison Collins
2020-04-03 22:09 ` [PATCH v8 39/39] xfsprogs: Rename __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=20200403220958.4944-31-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.