From: "Darrick J. Wong" <djwong@kernel.org>
To: Allison Henderson <allison.henderson@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH v19 12/14] xfs: Clean up xfs_attr_node_addname_clear_incomplete
Date: Tue, 25 May 2021 13:35:26 -0700 [thread overview]
Message-ID: <20210525203526.GJ202121@locust> (raw)
In-Reply-To: <20210525195504.7332-13-allison.henderson@oracle.com>
On Tue, May 25, 2021 at 12:55:02PM -0700, Allison Henderson wrote:
> We can use the helper function xfs_attr_node_remove_name to reduce
> duplicate code in this function
>
> Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
Nice cleanup,
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
--D
> ---
> fs/xfs/libxfs/xfs_attr.c | 11 +++--------
> 1 file changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
> index f7b0e79..32d451b 100644
> --- a/fs/xfs/libxfs/xfs_attr.c
> +++ b/fs/xfs/libxfs/xfs_attr.c
> @@ -63,6 +63,8 @@ STATIC int xfs_attr_fillstate(xfs_da_state_t *state);
> STATIC int xfs_attr_refillstate(xfs_da_state_t *state);
> STATIC int xfs_attr_set_iter(struct xfs_delattr_context *dac,
> struct xfs_buf **leaf_bp);
> +STATIC int xfs_attr_node_remove_name(struct xfs_da_args *args,
> + struct xfs_da_state *state);
>
> int
> xfs_inode_hasattr(
> @@ -1207,7 +1209,6 @@ xfs_attr_node_addname_clear_incomplete(
> {
> struct xfs_da_args *args = dac->da_args;
> struct xfs_da_state *state = NULL;
> - struct xfs_da_state_blk *blk;
> int retval = 0;
> int error = 0;
>
> @@ -1222,13 +1223,7 @@ xfs_attr_node_addname_clear_incomplete(
> 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);
> + error = xfs_attr_node_remove_name(args, state);
>
> /*
> * Check to see if the tree needs to be collapsed.
> --
> 2.7.4
>
next prev parent reply other threads:[~2021-05-25 20:35 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-25 19:54 [PATCH v19 00/14] Delay Ready Attributes Allison Henderson
2021-05-25 19:54 ` [PATCH v19 01/14] xfs: Reverse apply 72b97ea40d Allison Henderson
2021-05-25 19:54 ` [PATCH v19 02/14] xfs: Add xfs_attr_node_remove_name Allison Henderson
2021-05-25 19:54 ` [PATCH v19 03/14] xfs: Refactor xfs_attr_set_shortform Allison Henderson
2021-05-25 19:54 ` [PATCH v19 04/14] xfs: Separate xfs_attr_node_addname and xfs_attr_node_addname_clear_incomplete Allison Henderson
2021-05-25 19:54 ` [PATCH v19 05/14] xfs: Add helper xfs_attr_node_addname_find_attr Allison Henderson
2021-05-25 19:54 ` [PATCH v19 06/14] xfs: Hoist xfs_attr_node_addname Allison Henderson
2021-05-25 19:54 ` [PATCH v19 07/14] xfs: Hoist xfs_attr_leaf_addname Allison Henderson
2021-05-25 19:54 ` [PATCH v19 08/14] xfs: Hoist node transaction handling Allison Henderson
2021-05-25 19:54 ` [PATCH v19 09/14] xfs: Add delay ready attr remove routines Allison Henderson
2021-05-25 19:55 ` [PATCH v19 10/14] xfs: Add delay ready attr set routines Allison Henderson
2021-05-25 19:55 ` [PATCH v19 11/14] xfs: Remove xfs_attr_rmtval_set Allison Henderson
2021-05-25 20:34 ` Darrick J. Wong
2021-05-27 6:13 ` Chandan Babu R
2021-05-25 19:55 ` [PATCH v19 12/14] xfs: Clean up xfs_attr_node_addname_clear_incomplete Allison Henderson
2021-05-25 20:35 ` Darrick J. Wong [this message]
2021-05-27 7:03 ` Chandan Babu R
2021-05-25 19:55 ` [PATCH v19 13/14] xfs: Remove default ASSERT in xfs_attr_set_iter Allison Henderson
2021-05-25 20:52 ` Darrick J. Wong
2021-05-26 18:13 ` Allison Henderson
2021-05-27 7:40 ` Chandan Babu R
2021-05-25 19:55 ` [PATCH v19 14/14] xfs: Make attr name schemes consistent Allison Henderson
2021-05-25 20:36 ` Darrick J. Wong
2021-05-27 8:01 ` Chandan Babu R
2021-05-26 18:19 ` [PATCH v19 00/14] Delay Ready Attributes Darrick J. Wong
2021-05-27 16:54 ` Allison Henderson
2021-05-27 17:00 ` Darrick J. Wong
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=20210525203526.GJ202121@locust \
--to=djwong@kernel.org \
--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