From: Brian Foster <bfoster@redhat.com>
To: Allison Henderson <allison.henderson@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH v14 01/15] xfs: Add helper xfs_attr_node_remove_step
Date: Tue, 22 Dec 2020 11:50:09 -0500 [thread overview]
Message-ID: <20201222165009.GA2808393@bfoster> (raw)
In-Reply-To: <20201218072917.16805-2-allison.henderson@oracle.com>
On Fri, Dec 18, 2020 at 12:29:03AM -0700, Allison Henderson wrote:
> From: Allison Collins <allison.henderson@oracle.com>
>
> This patch as a new helper function xfs_attr_node_remove_step. This
> will help simplify and modularize the calling function
> xfs_attr_node_remove.
>
> Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/libxfs/xfs_attr.c | 46 ++++++++++++++++++++++++++++++++++------------
> 1 file changed, 34 insertions(+), 12 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
> index fd8e641..8b55a8d 100644
> --- a/fs/xfs/libxfs/xfs_attr.c
> +++ b/fs/xfs/libxfs/xfs_attr.c
> @@ -1228,19 +1228,14 @@ xfs_attr_node_remove_rmt(
> * the root node (a special case of an intermediate node).
> */
> STATIC int
> -xfs_attr_node_removename(
> - struct xfs_da_args *args)
> +xfs_attr_node_remove_step(
> + struct xfs_da_args *args,
> + struct xfs_da_state *state)
> {
> - struct xfs_da_state *state;
> struct xfs_da_state_blk *blk;
> int retval, error;
> struct xfs_inode *dp = args->dp;
>
> - trace_xfs_attr_node_removename(args);
> -
> - error = xfs_attr_node_removename_setup(args, &state);
> - if (error)
> - goto out;
>
> /*
> * If there is an out-of-line value, de-allocate the blocks.
> @@ -1250,7 +1245,7 @@ xfs_attr_node_removename(
> if (args->rmtblkno > 0) {
> error = xfs_attr_node_remove_rmt(args, state);
> if (error)
> - goto out;
> + return error;
> }
>
> /*
> @@ -1267,18 +1262,45 @@ xfs_attr_node_removename(
> if (retval && (state->path.active > 1)) {
> error = xfs_da3_join(state);
> if (error)
> - goto out;
> + return error;
> error = xfs_defer_finish(&args->trans);
> if (error)
> - goto out;
> + return error;
> /*
> * Commit the Btree join operation and start a new trans.
> */
> error = xfs_trans_roll_inode(&args->trans, dp);
> if (error)
> - goto out;
> + return error;
> }
>
> + return error;
> +}
> +
> +/*
> + * Remove a name from a B-tree attribute list.
> + *
> + * This routine will find the blocks of the name to remove, remove them and
> + * shrink the tree if needed.
> + */
> +STATIC int
> +xfs_attr_node_removename(
> + struct xfs_da_args *args)
> +{
> + struct xfs_da_state *state = NULL;
> + int error;
> + struct xfs_inode *dp = args->dp;
> +
> + trace_xfs_attr_node_removename(args);
> +
> + error = xfs_attr_node_removename_setup(args, &state);
> + if (error)
> + goto out;
> +
> + error = xfs_attr_node_remove_step(args, state);
> + if (error)
> + goto out;
> +
> /*
> * If the result is small enough, push it all into the inode.
> */
> --
> 2.7.4
>
next prev parent reply other threads:[~2020-12-22 16:51 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-18 7:29 [PATCH v14 00/15] xfs: Delayed Attributes Allison Henderson
2020-12-18 7:29 ` [PATCH v14 01/15] xfs: Add helper xfs_attr_node_remove_step Allison Henderson
2020-12-21 6:45 ` Chandan Babu R
2020-12-21 23:48 ` Allison Henderson
2020-12-22 16:50 ` Brian Foster [this message]
2020-12-18 7:29 ` [PATCH v14 02/15] xfs: Add xfs_attr_node_remove_cleanup Allison Henderson
2020-12-21 6:45 ` Chandan Babu R
2020-12-21 23:47 ` Allison Henderson
2020-12-22 16:50 ` Brian Foster
2020-12-18 7:29 ` [PATCH v14 03/15] xfs: Hoist transaction handling in xfs_attr_node_remove_step Allison Henderson
2020-12-21 6:45 ` Chandan Babu R
2020-12-21 21:51 ` Allison Henderson
2020-12-18 7:29 ` [PATCH v14 04/15] xfs: Add delay ready attr remove routines Allison Henderson
2020-12-22 7:22 ` Chandan Babu R
2020-12-22 15:41 ` Allison Henderson
2020-12-23 4:05 ` Chandan Babu R
2020-12-22 17:11 ` Brian Foster
2020-12-22 17:20 ` Brian Foster
2020-12-22 18:44 ` Brian Foster
2020-12-23 5:20 ` Allison Henderson
2020-12-23 14:16 ` Brian Foster
2020-12-24 8:23 ` Allison Henderson
2021-01-04 17:52 ` Brian Foster
2021-01-05 18:10 ` Allison Henderson
2021-01-06 14:25 ` Brian Foster
2020-12-18 7:29 ` [PATCH v14 05/15] xfs: Add delay ready attr set routines Allison Henderson
2020-12-23 8:00 ` Chandan Babu R
2020-12-23 16:31 ` Allison Henderson
2020-12-18 7:29 ` [PATCH v14 06/15] xfs: Add state machine tracepoints Allison Henderson
2021-01-05 4:50 ` Chandan Babu R
2021-01-05 21:06 ` Allison Henderson
2021-01-05 5:28 ` Darrick J. Wong
2021-01-05 21:07 ` Allison Henderson
2020-12-18 7:29 ` [PATCH v14 07/15] xfs: Rename __xfs_attr_rmtval_remove Allison Henderson
2020-12-18 7:29 ` [PATCH v14 08/15] xfs: Handle krealloc errors in xlog_recover_add_to_cont_trans Allison Henderson
2021-01-05 5:38 ` Darrick J. Wong
2021-01-05 20:15 ` Allison Henderson
2020-12-18 7:29 ` [PATCH v14 09/15] xfs: Set up infastructure for deferred attribute operations Allison Henderson
2020-12-18 7:29 ` [PATCH v14 10/15] xfs: Skip flip flags for delayed attrs Allison Henderson
2020-12-18 7:29 ` [PATCH v14 11/15] xfs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred Allison Henderson
2020-12-18 7:29 ` [PATCH v14 12/15] xfs: Remove unused xfs_attr_*_args Allison Henderson
2020-12-18 7:29 ` [PATCH v14 13/15] xfs: Add delayed attributes error tag Allison Henderson
2020-12-18 7:29 ` [PATCH v14 14/15] xfs: Add delattr mount option Allison Henderson
2021-01-05 5:46 ` Darrick J. Wong
2021-01-05 21:49 ` Allison Henderson
2020-12-18 7:29 ` [PATCH v14 15/15] xfs: Merge xfs_delattr_context into xfs_attr_item Allison Henderson
2021-01-05 5:47 ` Darrick J. Wong
2021-01-05 21:07 ` Allison Henderson
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=20201222165009.GA2808393@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