From: Allison Collins <allison.henderson@oracle.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH v11 21/25] xfs: Simplify xfs_attr_node_addname
Date: Fri, 24 Jul 2020 17:08:46 -0700 [thread overview]
Message-ID: <7157b896-5bd5-0785-b401-37018352554f@oracle.com> (raw)
In-Reply-To: <20200721234103.GL3151642@magnolia>
On 7/21/20 4:41 PM, Darrick J. Wong wrote:
> On Mon, Jul 20, 2020 at 05:16:02PM -0700, Allison Collins wrote:
>> 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>
>
> Looks ok, diff is dumb :(
> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Yeah, a lot of times a graphical viewer makes this much easier to look
at. Thanks for the review!
Allison
>
> --D
>
>> ---
>> fs/xfs/libxfs/xfs_attr.c | 125 +++++++++++++++++++++++------------------------
>> 1 file changed, 61 insertions(+), 64 deletions(-)
>>
>> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
>> index ca1e851..e618b09 100644
>> --- a/fs/xfs/libxfs/xfs_attr.c
>> +++ b/fs/xfs/libxfs/xfs_attr.c
>> @@ -1030,80 +1030,77 @@ xfs_attr_node_addname(
>> 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-25 0:08 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-21 0:15 [PATCH v11 00/25] xfs: Delay Ready Attributes Allison Collins
2020-07-21 0:15 ` [PATCH v11 01/25] xfs: Add xfs_has_attr and subroutines Allison Collins
2020-07-21 23:26 ` Darrick J. Wong
2020-07-24 2:24 ` Dave Chinner
2020-07-25 2:49 ` Allison Collins
2020-07-21 0:15 ` [PATCH v11 02/25] xfs: Check for -ENOATTR or -EEXIST Allison Collins
2020-07-21 0:15 ` [PATCH v11 03/25] xfs: Factor out new helper functions xfs_attr_rmtval_set Allison Collins
2020-07-21 0:15 ` [PATCH v11 04/25] xfs: Pull up trans handling in xfs_attr3_leaf_flipflags Allison Collins
2020-07-21 0:15 ` [PATCH v11 05/25] xfs: Split apart xfs_attr_leaf_addname Allison Collins
2020-07-21 23:19 ` Darrick J. Wong
2020-07-25 0:07 ` Allison Collins
2020-07-21 0:15 ` [PATCH v11 06/25] xfs: Refactor xfs_attr_try_sf_addname Allison Collins
2020-07-21 0:15 ` [PATCH v11 07/25] xfs: Pull up trans roll from xfs_attr3_leaf_setflag Allison Collins
2020-07-21 0:15 ` [PATCH v11 08/25] xfs: Factor out xfs_attr_rmtval_invalidate Allison Collins
2020-07-21 0:15 ` [PATCH v11 09/25] xfs: Pull up trans roll in xfs_attr3_leaf_clearflag Allison Collins
2020-07-21 0:15 ` [PATCH v11 10/25] xfs: Refactor xfs_attr_rmtval_remove Allison Collins
2020-07-21 23:31 ` Darrick J. Wong
2020-07-22 0:24 ` Darrick J. Wong
2020-07-25 0:08 ` Allison Collins
2020-07-25 0:46 ` Darrick J. Wong
2020-07-25 0:07 ` Allison Collins
2020-07-21 0:15 ` [PATCH v11 11/25] xfs: Pull up xfs_attr_rmtval_invalidate Allison Collins
2020-07-21 0:15 ` [PATCH v11 12/25] xfs: Add helper function xfs_attr_node_shrink Allison Collins
2020-07-21 0:15 ` [PATCH v11 13/25] xfs: Remove unneeded xfs_trans_roll_inode calls Allison Collins
2020-07-21 23:34 ` Darrick J. Wong
2020-07-25 0:08 ` Allison Collins
2020-07-21 0:15 ` [PATCH v11 14/25] xfs: Remove xfs_trans_roll in xfs_attr_node_removename Allison Collins
2020-07-21 23:38 ` Darrick J. Wong
2020-07-25 0:08 ` Allison Collins
2020-07-21 0:15 ` [PATCH v11 15/25] xfs: Add helpers xfs_attr_is_shortform and xfs_attr_set_shortform Allison Collins
2020-07-21 0:15 ` [PATCH v11 16/25] xfs: Add helper function xfs_attr_leaf_mark_incomplete Allison Collins
2020-07-21 0:15 ` [PATCH v11 17/25] xfs: Add remote block helper functions Allison Collins
2020-07-21 0:15 ` [PATCH v11 18/25] xfs: Add helper function xfs_attr_node_removename_setup Allison Collins
2020-07-21 0:16 ` [PATCH v11 19/25] xfs: Add helper function xfs_attr_node_removename_rmt Allison Collins
2020-07-21 0:16 ` [PATCH v11 20/25] xfs: Simplify xfs_attr_leaf_addname Allison Collins
2020-07-21 23:39 ` Darrick J. Wong
2020-07-25 0:07 ` Allison Collins
2020-07-21 0:16 ` [PATCH v11 21/25] xfs: Simplify xfs_attr_node_addname Allison Collins
2020-07-21 23:41 ` Darrick J. Wong
2020-07-25 0:08 ` Allison Collins [this message]
2020-07-21 0:16 ` [PATCH v11 22/25] xfs: Lift -ENOSPC handler from xfs_attr_leaf_addname Allison Collins
2020-07-21 0:16 ` [PATCH v11 23/25] xfs: Add delay ready attr remove routines Allison Collins
2020-07-21 0:16 ` [PATCH v11 24/25] xfs: Add delay ready attr set routines Allison Collins
2020-07-21 0:16 ` [PATCH v11 25/25] xfs: Rename __xfs_attr_rmtval_remove Allison Collins
2020-07-24 3:41 ` [PATCH v11 00/25] xfs: Delay Ready Attributes Dave Chinner
2020-07-24 5:35 ` Dave Chinner
2020-07-25 2:50 ` Allison Collins
2020-07-25 2:49 ` 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=7157b896-5bd5-0785-b401-37018352554f@oracle.com \
--to=allison.henderson@oracle.com \
--cc=darrick.wong@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).