From: Allison Collins <allison.henderson@oracle.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH v11 22/26] xfsprogs: Simplify xfs_attr_node_addname
Date: Fri, 17 Jul 2020 21:33:38 -0700 [thread overview]
Message-ID: <20200718043342.6432-23-allison.henderson@oracle.com> (raw)
In-Reply-To: <20200718043342.6432-1-allison.henderson@oracle.com>
Invert the rename logic in xfs_attr_node_addname to simplify the
delayed attr logic later.
Signed-off-by: Allison Collins <allison.henderson@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
---
libxfs/xfs_attr.c | 125 ++++++++++++++++++++++++++----------------------------
1 file changed, 61 insertions(+), 64 deletions(-)
diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index 0cf48ed..6ff064d 100644
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -1030,80 +1030,77 @@ restart:
return error;
}
- /*
- * If this is an atomic rename operation, we must "flip" the
- * incomplete flags on the "new" and "old" attribute/value pairs
- * so that one disappears and one appears atomically. Then we
- * must remove the "old" attribute/value pair.
- */
- if (args->op_flags & XFS_DA_OP_RENAME) {
- /*
- * In a separate transaction, set the incomplete flag on the
- * "old" attr and clear the incomplete flag on the "new" attr.
- */
- error = xfs_attr3_leaf_flipflags(args);
- if (error)
- goto out;
+ if (!(args->op_flags & XFS_DA_OP_RENAME)) {
/*
- * Commit the flag value change and start the next trans in
- * series
+ * Added a "remote" value, just clear the incomplete flag.
*/
- error = xfs_trans_roll_inode(&args->trans, args->dp);
- if (error)
- goto out;
+ if (args->rmtblkno > 0)
+ error = xfs_attr3_leaf_clearflag(args);
+ retval = error;
+ goto out;
+ }
- /*
- * Dismantle the "old" attribute/value pair by removing
- * a "remote" value (if it exists).
- */
- xfs_attr_restore_rmt_blk(args);
+ /*
+ * If this is an atomic rename operation, we must "flip" the incomplete
+ * flags on the "new" and "old" attribute/value pairs so that one
+ * disappears and one appears atomically. Then we must remove the "old"
+ * attribute/value pair.
+ *
+ * In a separate transaction, set the incomplete flag on the "old" attr
+ * and clear the incomplete flag on the "new" attr.
+ */
+ error = xfs_attr3_leaf_flipflags(args);
+ if (error)
+ goto out;
+ /*
+ * Commit the flag value change and start the next trans in series
+ */
+ error = xfs_trans_roll_inode(&args->trans, args->dp);
+ if (error)
+ goto out;
- if (args->rmtblkno) {
- error = xfs_attr_rmtval_invalidate(args);
- if (error)
- return error;
+ /*
+ * Dismantle the "old" attribute/value pair by removing a "remote" value
+ * (if it exists).
+ */
+ xfs_attr_restore_rmt_blk(args);
- error = xfs_attr_rmtval_remove(args);
- if (error)
- return error;
- }
+ if (args->rmtblkno) {
+ error = xfs_attr_rmtval_invalidate(args);
+ if (error)
+ return error;
- /*
- * Re-find the "old" attribute entry after any split ops.
- * The INCOMPLETE flag means that we will find the "old"
- * attr, not the "new" one.
- */
- args->attr_filter |= XFS_ATTR_INCOMPLETE;
- state = xfs_da_state_alloc();
- state->args = args;
- state->mp = mp;
- state->inleaf = 0;
- error = xfs_da3_node_lookup_int(state, &retval);
+ error = xfs_attr_rmtval_remove(args);
if (error)
- goto out;
+ 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);
- error = xfs_attr3_leaf_remove(blk->bp, args);
- xfs_da3_fixhashpath(state, &state->path);
+ /*
+ * Re-find the "old" attribute entry after any split ops. The INCOMPLETE
+ * flag means that we will find the "old" attr, not the "new" one.
+ */
+ args->attr_filter |= XFS_ATTR_INCOMPLETE;
+ state = xfs_da_state_alloc();
+ state->args = args;
+ state->mp = mp;
+ state->inleaf = 0;
+ error = xfs_da3_node_lookup_int(state, &retval);
+ if (error)
+ goto out;
- /*
- * Check to see if the tree needs to be collapsed.
- */
- if (retval && (state->path.active > 1)) {
- error = xfs_da3_join(state);
- if (error)
- goto out;
- }
+ /*
+ * 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);
+ error = xfs_attr3_leaf_remove(blk->bp, args);
+ xfs_da3_fixhashpath(state, &state->path);
- } else if (args->rmtblkno > 0) {
- /*
- * Added a "remote" value, just clear the incomplete flag.
- */
- error = xfs_attr3_leaf_clearflag(args);
+ /*
+ * Check to see if the tree needs to be collapsed.
+ */
+ if (retval && (state->path.active > 1)) {
+ error = xfs_da3_join(state);
if (error)
goto out;
}
--
2.7.4
next prev parent reply other threads:[~2020-07-18 4:34 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-18 4:33 [PATCH v11 00/26] xfsprogs: Delay Ready Attributes Allison Collins
2020-07-18 4:33 ` [PATCH v11 01/26] xfs: random buffer write failure errortag Allison Collins
2020-07-18 4:33 ` [PATCH v11 02/26] xfsprogs: Add xfs_has_attr and subroutines Allison Collins
2020-07-18 4:33 ` [PATCH v11 03/26] xfsprogs: Check for -ENOATTR or -EEXIST Allison Collins
2020-07-18 4:33 ` [PATCH v11 04/26] xfsprogs: Factor out new helper functions xfs_attr_rmtval_set Allison Collins
2020-07-18 4:33 ` [PATCH v11 05/26] xfsprogs: Pull up trans handling in xfs_attr3_leaf_flipflags Allison Collins
2020-07-18 4:33 ` [PATCH v11 06/26] xfsprogs: Split apart xfs_attr_leaf_addname Allison Collins
2020-07-18 4:33 ` [PATCH v11 07/26] xfsprogs: Refactor xfs_attr_try_sf_addname Allison Collins
2020-07-18 4:33 ` [PATCH v11 08/26] xfsprogs: Pull up trans roll from xfs_attr3_leaf_setflag Allison Collins
2020-07-18 4:33 ` [PATCH v11 09/26] xfsprogs: Factor out xfs_attr_rmtval_invalidate Allison Collins
2020-07-18 4:33 ` [PATCH v11 10/26] xfsprogs: Pull up trans roll in xfs_attr3_leaf_clearflag Allison Collins
2020-07-18 4:33 ` [PATCH v11 11/26] xfsprogs: Refactor xfs_attr_rmtval_remove Allison Collins
2020-07-18 4:33 ` [PATCH v11 12/26] xfsprogs: Pull up xfs_attr_rmtval_invalidate Allison Collins
2020-07-18 4:33 ` [PATCH v11 13/26] xfsprogs: Add helper function xfs_attr_node_shrink Allison Collins
2020-07-18 4:33 ` [PATCH v11 14/26] xfsprogs: Remove unneeded xfs_trans_roll_inode calls Allison Collins
2020-07-18 4:33 ` [PATCH v11 15/26] xfsprogs: Remove xfs_trans_roll in xfs_attr_node_removename Allison Collins
2020-07-18 4:33 ` [PATCH v11 16/26] xfsprogs: Add helpers xfs_attr_is_shortform and xfs_attr_set_shortform Allison Collins
2020-07-18 4:33 ` [PATCH v11 17/26] xfsprogs: Add helper function xfs_attr_leaf_mark_incomplete Allison Collins
2020-07-18 4:33 ` [PATCH v11 18/26] xfsprogs: Add remote block helper functions Allison Collins
2020-07-18 4:33 ` [PATCH v11 19/26] xfsprogs: Add helper function xfs_attr_node_removename_setup Allison Collins
2020-07-18 4:33 ` [PATCH v11 20/26] xfsprogs: Add helper function xfs_attr_node_removename_rmt Allison Collins
2020-07-18 4:33 ` [PATCH v11 21/26] xfsprogs: Simplify xfs_attr_leaf_addname Allison Collins
2020-07-18 4:33 ` Allison Collins [this message]
2020-07-18 4:33 ` [PATCH v11 23/26] xfsprogs: Lift -ENOSPC handler from xfs_attr_leaf_addname Allison Collins
2020-07-18 4:33 ` [PATCH v11 24/26] xfsprogs: Add delay ready attr remove routines Allison Collins
2020-07-18 4:33 ` [PATCH v11 25/26] xfsprogs: Add delay ready attr set routines Allison Collins
2020-07-18 4:33 ` [PATCH v11 26/26] 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=20200718043342.6432-23-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;
as well as URLs for NNTP newsgroup(s).