From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Allison Collins <allison.henderson@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH v11 05/25] xfs: Split apart xfs_attr_leaf_addname
Date: Tue, 21 Jul 2020 16:19:44 -0700 [thread overview]
Message-ID: <20200721231944.GG3151642@magnolia> (raw)
In-Reply-To: <20200721001606.10781-6-allison.henderson@oracle.com>
On Mon, Jul 20, 2020 at 05:15:46PM -0700, Allison Collins wrote:
> Split out new helper function xfs_attr_leaf_try_add from
> xfs_attr_leaf_addname. Because new delayed attribute routines cannot
> roll transactions, we split off the parts of xfs_attr_leaf_addname that
> we can use, and move the commit into the calling function.
>
> Signed-off-by: Allison Collins <allison.henderson@oracle.com>
> Reviewed-by: Brian Foster <bfoster@redhat.com>
> Reviewed-by: Chandan Rajendra <chandanrlinux@gmail.com>
Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> ---
> fs/xfs/libxfs/xfs_attr.c | 95 +++++++++++++++++++++++++++++++-----------------
> 1 file changed, 61 insertions(+), 34 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
> index 28a9f8e..6fc6dc6 100644
> --- a/fs/xfs/libxfs/xfs_attr.c
> +++ b/fs/xfs/libxfs/xfs_attr.c
> @@ -256,10 +256,31 @@ xfs_attr_set_args(
> }
> }
>
> - if (xfs_bmap_one_block(dp, XFS_ATTR_FORK))
> + if (xfs_bmap_one_block(dp, XFS_ATTR_FORK)) {
> error = xfs_attr_leaf_addname(args);
> - else
> - error = xfs_attr_node_addname(args);
> + if (error != -ENOSPC)
> + return error;
> +
> + /*
> + * Finish any deferred work items and roll the transaction once
> + * more. The goal here is to call node_addname with the inode
> + * and transaction in the same state (inode locked and joined,
> + * transaction clean) no matter how we got to this step.
> + */
> + error = xfs_defer_finish(&args->trans);
> + if (error)
> + return error;
> +
> + /*
> + * Commit the current trans (including the inode) and
> + * start a new one.
> + */
> + error = xfs_trans_roll_inode(&args->trans, dp);
> + if (error)
> + return error;
> + }
> +
> + error = xfs_attr_node_addname(args);
> return error;
> }
>
> @@ -507,20 +528,21 @@ xfs_attr_shortform_addname(xfs_da_args_t *args)
> *========================================================================*/
>
> /*
> - * Add a name to the leaf attribute list structure
> + * Tries to add an attribute to an inode in leaf form
> *
> - * This leaf block cannot have a "remote" value, we only call this routine
> - * if bmap_one_block() says there is only one block (ie: no remote blks).
> + * This function is meant to execute as part of a delayed operation and leaves
> + * the transaction handling to the caller. On success the attribute is added
> + * and the inode and transaction are left dirty. If there is not enough space,
> + * the attr data is converted to node format and -ENOSPC is returned. Caller is
> + * responsible for handling the dirty inode and transaction or adding the attr
> + * in node format.
> */
> STATIC int
> -xfs_attr_leaf_addname(
> - struct xfs_da_args *args)
> +xfs_attr_leaf_try_add(
> + struct xfs_da_args *args,
> + struct xfs_buf *bp)
> {
> - struct xfs_buf *bp;
> - int retval, error, forkoff;
> - struct xfs_inode *dp = args->dp;
> -
> - trace_xfs_attr_leaf_addname(args);
> + int retval, error;
>
> /*
> * Look up the given attribute in the leaf block. Figure out if
> @@ -562,31 +584,39 @@ xfs_attr_leaf_addname(
> retval = xfs_attr3_leaf_add(bp, args);
> if (retval == -ENOSPC) {
> /*
> - * Promote the attribute list to the Btree format, then
> - * Commit that transaction so that the node_addname() call
> - * can manage its own transactions.
> + * Promote the attribute list to the Btree format. Unless an
> + * error occurs, retain the -ENOSPC retval
> */
> error = xfs_attr3_leaf_to_node(args);
> if (error)
> return error;
> - error = xfs_defer_finish(&args->trans);
> - if (error)
> - return error;
> + }
> + return retval;
> +out_brelse:
> + xfs_trans_brelse(args->trans, bp);
> + return retval;
> +}
>
> - /*
> - * Commit the current trans (including the inode) and start
> - * a new one.
> - */
> - error = xfs_trans_roll_inode(&args->trans, dp);
> - if (error)
> - return error;
>
> - /*
> - * Fob the whole rest of the problem off on the Btree code.
> - */
> - error = xfs_attr_node_addname(args);
> +/*
> + * Add a name to the leaf attribute list structure
> + *
> + * This leaf block cannot have a "remote" value, we only call this routine
> + * if bmap_one_block() says there is only one block (ie: no remote blks).
> + */
> +STATIC int
> +xfs_attr_leaf_addname(
> + struct xfs_da_args *args)
> +{
> + int error, forkoff;
> + struct xfs_buf *bp = NULL;
> + struct xfs_inode *dp = args->dp;
> +
> + trace_xfs_attr_leaf_addname(args);
> +
> + error = xfs_attr_leaf_try_add(args, bp);
> + if (error)
> return error;
> - }
>
> /*
> * Commit the transaction that added the attr name so that
> @@ -681,9 +711,6 @@ xfs_attr_leaf_addname(
> error = xfs_attr3_leaf_clearflag(args);
> }
> return error;
> -out_brelse:
> - xfs_trans_brelse(args->trans, bp);
> - return retval;
> }
>
> /*
> --
> 2.7.4
>
next prev parent reply other threads:[~2020-07-21 23:21 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 [this message]
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
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=20200721231944.GG3151642@magnolia \
--to=darrick.wong@oracle.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).