From: Brian Foster <bfoster@redhat.com>
To: Allison Collins <allison.henderson@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH v9 19/24] xfs: Simplify xfs_attr_leaf_addname
Date: Tue, 5 May 2020 09:11:47 -0400 [thread overview]
Message-ID: <20200505131147.GC60048@bfoster> (raw)
In-Reply-To: <20200430225016.4287-20-allison.henderson@oracle.com>
On Thu, Apr 30, 2020 at 03:50:11PM -0700, Allison Collins wrote:
> Quick patch to unnest the rename logic in the leaf code path. This will
> help simplify delayed attr logic later.
>
> Signed-off-by: Allison Collins <allison.henderson@oracle.com>
> ---
With Darrick's cleanups:
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/libxfs/xfs_attr.c | 108 +++++++++++++++++++++++------------------------
> 1 file changed, 53 insertions(+), 55 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
> index ab1c9fa..1810f90 100644
> --- a/fs/xfs/libxfs/xfs_attr.c
> +++ b/fs/xfs/libxfs/xfs_attr.c
> @@ -694,73 +694,71 @@ xfs_attr_leaf_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) {
> + if ((args->op_flags & XFS_DA_OP_RENAME) == 0) {
> /*
> - * 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)
> - return error;
> - /*
> - * 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)
> - return error;
> + if (args->rmtblkno > 0)
> + error = xfs_attr3_leaf_clearflag(args);
>
> - /*
> - * Dismantle the "old" attribute/value pair by removing
> - * a "remote" value (if it exists).
> - */
> - xfs_attr_restore_rmt_blk(args);
> + return error;
> + }
>
> - if (args->rmtblkno) {
> - error = xfs_attr_rmtval_invalidate(args);
> - if (error)
> - 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.
> + *
> + * In a separate transaction, set the incomplete flag on the "old" attr
> + * and clear the incomplete flag on the "new" attr.
> + */
>
> - error = xfs_attr_rmtval_remove(args);
> - if (error)
> - return error;
> - }
> + error = xfs_attr3_leaf_flipflags(args);
> + if (error)
> + return error;
> + /*
> + * Commit the flag value change and start the next trans in series.
> + */
> + error = xfs_trans_roll_inode(&args->trans, args->dp);
> + if (error)
> + return error;
>
> - /*
> - * Read in the block containing the "old" attr, then
> - * remove the "old" attr from that block (neat, huh!)
> - */
> - error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno,
> - &bp);
> + /*
> + * Dismantle the "old" attribute/value pair by removing a "remote" value
> + * (if it exists).
> + */
> + xfs_attr_restore_rmt_blk(args);
> +
> + if (args->rmtblkno) {
> + error = xfs_attr_rmtval_invalidate(args);
> if (error)
> return error;
>
> - xfs_attr3_leaf_remove(bp, args);
> -
> - /*
> - * If the result is small enough, shrink it all into the inode.
> - */
> - 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)
> - return error;
> - }
> -
> - } else if (args->rmtblkno > 0) {
> - /*
> - * Added a "remote" value, just clear the incomplete flag.
> - */
> - error = xfs_attr3_leaf_clearflag(args);
> + error = xfs_attr_rmtval_remove(args);
> if (error)
> return error;
> }
> +
> + /*
> + * Read in the block containing the "old" attr, then remove the "old"
> + * attr from that block (neat, huh!)
> + */
> + error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno,
> + &bp);
> + if (error)
> + return error;
> +
> + xfs_attr3_leaf_remove(bp, args);
> +
> + /*
> + * If the result is small enough, shrink it all into the inode.
> + */
> + 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 */
> +
> return error;
> }
>
> --
> 2.7.4
>
next prev parent reply other threads:[~2020-05-05 13:11 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-30 22:49 [PATCH v9 00/24] xfs: Delay Ready Attributes Allison Collins
2020-04-30 22:49 ` [PATCH v9 01/24] xfs: Add xfs_has_attr and subroutines Allison Collins
2020-04-30 22:49 ` [PATCH v9 02/24] xfs: Check for -ENOATTR or -EEXIST Allison Collins
2020-04-30 22:49 ` [PATCH v9 03/24] xfs: Factor out new helper functions xfs_attr_rmtval_set Allison Collins
2020-04-30 22:49 ` [PATCH v9 04/24] xfs: Pull up trans handling in xfs_attr3_leaf_flipflags Allison Collins
2020-04-30 22:49 ` [PATCH v9 05/24] xfs: Split apart xfs_attr_leaf_addname Allison Collins
2020-05-04 17:33 ` Darrick J. Wong
2020-05-04 22:34 ` Allison Collins
2020-04-30 22:49 ` [PATCH v9 06/24] xfs: Refactor xfs_attr_try_sf_addname Allison Collins
2020-04-30 22:49 ` [PATCH v9 07/24] xfs: Pull up trans roll from xfs_attr3_leaf_setflag Allison Collins
2020-04-30 22:50 ` [PATCH v9 08/24] xfs: Factor out xfs_attr_rmtval_invalidate Allison Collins
2020-04-30 22:50 ` [PATCH v9 09/24] xfs: Pull up trans roll in xfs_attr3_leaf_clearflag Allison Collins
2020-04-30 22:50 ` [PATCH v9 10/24] xfs: Add helper function __xfs_attr_rmtval_remove Allison Collins
2020-05-04 13:27 ` Brian Foster
2020-05-04 21:36 ` Allison Collins
2020-05-05 12:03 ` Brian Foster
2020-05-05 17:35 ` Allison Collins
2020-05-04 17:41 ` Darrick J. Wong
2020-05-04 22:53 ` Allison Collins
2020-05-04 22:57 ` Darrick J. Wong
2020-04-30 22:50 ` [PATCH v9 11/24] xfs: Pull up xfs_attr_rmtval_invalidate Allison Collins
2020-05-04 13:27 ` Brian Foster
2020-05-04 21:37 ` Allison Collins
2020-05-04 17:41 ` Darrick J. Wong
2020-05-04 22:55 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 12/24] xfs: Add helper function xfs_attr_node_shrink Allison Collins
2020-05-04 13:27 ` Brian Foster
2020-05-04 21:37 ` Allison Collins
2020-05-04 17:42 ` Darrick J. Wong
2020-05-04 22:55 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 13/24] xfs: Remove unneeded xfs_trans_roll_inode calls Allison Collins
2020-05-04 13:30 ` Brian Foster
2020-05-04 22:15 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 14/24] xfs: Add helpers xfs_attr_is_shortform and xfs_attr_set_shortform Allison Collins
2020-05-04 18:46 ` Darrick J. Wong
2020-05-05 0:29 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 15/24] xfs: Add helper function xfs_attr_leaf_mark_incomplete Allison Collins
2020-05-04 18:47 ` Darrick J. Wong
2020-04-30 22:50 ` [PATCH v9 16/24] xfs: Add remote block helper functions Allison Collins
2020-05-04 18:55 ` Darrick J. Wong
2020-05-04 23:01 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 17/24] xfs: Add helper function xfs_attr_node_removename_setup Allison Collins
2020-05-04 18:58 ` Darrick J. Wong
2020-05-04 23:02 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 18/24] xfs: Add helper function xfs_attr_node_removename_rmt Allison Collins
2020-05-04 19:00 ` Darrick J. Wong
2020-05-04 23:04 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 19/24] xfs: Simplify xfs_attr_leaf_addname Allison Collins
2020-05-04 19:03 ` Darrick J. Wong
2020-05-04 23:06 ` Allison Collins
2020-05-05 13:11 ` Brian Foster [this message]
2020-05-05 17:35 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 20/24] xfs: Simplify xfs_attr_node_addname Allison Collins
2020-05-04 19:06 ` Darrick J. Wong
2020-05-04 23:16 ` Allison Collins
2020-05-05 13:12 ` Brian Foster
2020-05-05 17:35 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 21/24] xfs: Lift -ENOSPC handler from xfs_attr_leaf_addname Allison Collins
2020-05-04 19:10 ` Darrick J. Wong
2020-05-04 23:17 ` Allison Collins
2020-05-05 13:12 ` Brian Foster
2020-05-05 17:37 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 22/24] xfs: Add delay ready attr remove routines Allison Collins
2020-05-04 19:33 ` Darrick J. Wong
2020-05-05 0:26 ` Allison Collins
2020-05-05 1:44 ` Darrick J. Wong
2020-05-05 17:35 ` Allison Collins
2020-05-07 11:54 ` Brian Foster
2020-04-30 22:50 ` [PATCH v9 23/24] xfs: Add delay ready attr set routines Allison Collins
2020-05-04 19:49 ` Darrick J. Wong
2020-05-05 1:31 ` Allison Collins
2020-05-04 22:36 ` Darrick J. Wong
2020-05-05 1:32 ` Allison Collins
2020-04-30 22:50 ` [PATCH v9 24/24] xfs: Rename __xfs_attr_rmtval_remove Allison Collins
2020-05-04 19:34 ` Darrick J. Wong
2020-05-05 0:27 ` 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=20200505131147.GC60048@bfoster \
--to=bfoster@redhat.com \
--cc=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).