From: "Darrick J. Wong" <djwong@kernel.org>
To: Allison Henderson <allison.henderson@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH v20 14/14] xfs: Make attr name schemes consistent
Date: Mon, 7 Jun 2021 09:20:25 -0700 [thread overview]
Message-ID: <20210607162025.GL2945738@locust> (raw)
In-Reply-To: <20210607052747.31422-5-allison.henderson@oracle.com>
On Sun, Jun 06, 2021 at 10:27:47PM -0700, Allison Henderson wrote:
> This patch renames the following functions to make the nameing scheme more consistent:
> xfs_attr_shortform_remove -> xfs_attr_sf_removename
> xfs_attr_node_remove_name -> xfs_attr_node_removename
> xfs_attr_set_fmt -> xfs_attr_sf_addname
>
> Suggested-by: Darrick J. Wong <djwong@kernel.org>
> Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
--D
> ---
> fs/xfs/libxfs/xfs_attr.c | 18 +++++++++---------
> fs/xfs/libxfs/xfs_attr_leaf.c | 2 +-
> fs/xfs/libxfs/xfs_attr_leaf.h | 2 +-
> 3 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
> index a0edebc..611dc67 100644
> --- a/fs/xfs/libxfs/xfs_attr.c
> +++ b/fs/xfs/libxfs/xfs_attr.c
> @@ -63,8 +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);
> +STATIC int xfs_attr_node_removename(struct xfs_da_args *args,
> + struct xfs_da_state *state);
>
> int
> xfs_inode_hasattr(
> @@ -298,7 +298,7 @@ xfs_attr_set_args(
> }
>
> STATIC int
> -xfs_attr_set_fmt(
> +xfs_attr_sf_addname(
> struct xfs_delattr_context *dac,
> struct xfs_buf **leaf_bp)
> {
> @@ -367,7 +367,7 @@ xfs_attr_set_iter(
> * release the hold once we return with a clean transaction.
> */
> if (xfs_attr_is_shortform(dp))
> - return xfs_attr_set_fmt(dac, leaf_bp);
> + return xfs_attr_sf_addname(dac, leaf_bp);
> if (*leaf_bp != NULL) {
> xfs_trans_bhold_release(args->trans, *leaf_bp);
> *leaf_bp = NULL;
> @@ -840,7 +840,7 @@ xfs_attr_shortform_addname(xfs_da_args_t *args)
> if (retval == -EEXIST) {
> if (args->attr_flags & XATTR_CREATE)
> return retval;
> - retval = xfs_attr_shortform_remove(args);
> + retval = xfs_attr_sf_removename(args);
> if (retval)
> return retval;
> /*
> @@ -1223,7 +1223,7 @@ xfs_attr_node_addname_clear_incomplete(
> if (error)
> goto out;
>
> - error = xfs_attr_node_remove_name(args, state);
> + error = xfs_attr_node_removename(args, state);
>
> /*
> * Check to see if the tree needs to be collapsed.
> @@ -1339,7 +1339,7 @@ int xfs_attr_node_removename_setup(
> }
>
> STATIC int
> -xfs_attr_node_remove_name(
> +xfs_attr_node_removename(
> struct xfs_da_args *args,
> struct xfs_da_state *state)
> {
> @@ -1390,7 +1390,7 @@ xfs_attr_remove_iter(
> * thus state transitions. Call the right helper and return.
> */
> if (dp->i_afp->if_format == XFS_DINODE_FMT_LOCAL)
> - return xfs_attr_shortform_remove(args);
> + return xfs_attr_sf_removename(args);
>
> if (xfs_attr_is_leaf(dp))
> return xfs_attr_leaf_removename(args);
> @@ -1453,7 +1453,7 @@ xfs_attr_remove_iter(
> goto out;
> }
>
> - retval = xfs_attr_node_remove_name(args, state);
> + retval = xfs_attr_node_removename(args, state);
>
> /*
> * Check to see if the tree needs to be collapsed. If so, roll
> diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c
> index d97de20..5a3d261 100644
> --- a/fs/xfs/libxfs/xfs_attr_leaf.c
> +++ b/fs/xfs/libxfs/xfs_attr_leaf.c
> @@ -773,7 +773,7 @@ xfs_attr_fork_remove(
> * Remove an attribute from the shortform attribute list structure.
> */
> int
> -xfs_attr_shortform_remove(
> +xfs_attr_sf_removename(
> struct xfs_da_args *args)
> {
> struct xfs_attr_shortform *sf;
> diff --git a/fs/xfs/libxfs/xfs_attr_leaf.h b/fs/xfs/libxfs/xfs_attr_leaf.h
> index 9b1c59f..efa757f 100644
> --- a/fs/xfs/libxfs/xfs_attr_leaf.h
> +++ b/fs/xfs/libxfs/xfs_attr_leaf.h
> @@ -51,7 +51,7 @@ int xfs_attr_shortform_lookup(struct xfs_da_args *args);
> int xfs_attr_shortform_getvalue(struct xfs_da_args *args);
> int xfs_attr_shortform_to_leaf(struct xfs_da_args *args,
> struct xfs_buf **leaf_bp);
> -int xfs_attr_shortform_remove(struct xfs_da_args *args);
> +int xfs_attr_sf_removename(struct xfs_da_args *args);
> int xfs_attr_sf_findname(struct xfs_da_args *args,
> struct xfs_attr_sf_entry **sfep,
> unsigned int *basep);
> --
> 2.7.4
>
prev parent reply other threads:[~2021-06-07 16:26 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-07 5:27 [PATCH v20 10/14] xfs: Add delay ready attr set routines Allison Henderson
2021-06-07 5:27 ` [PATCH v20 11/14] xfs: Remove xfs_attr_rmtval_set Allison Henderson
2021-06-07 5:27 ` [PATCH v20 12/14] xfs: Clean up xfs_attr_node_addname_clear_incomplete Allison Henderson
2021-06-07 5:27 ` [PATCH v20 13/14] xfs: Fix default ASSERT in xfs_attr_set_iter Allison Henderson
2021-06-07 8:33 ` Chandan Babu R
2021-06-07 16:19 ` Darrick J. Wong
2021-06-07 5:27 ` [PATCH v20 14/14] xfs: Make attr name schemes consistent Allison Henderson
2021-06-07 8:35 ` Chandan Babu R
2021-06-07 16:20 ` Darrick J. Wong [this message]
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=20210607162025.GL2945738@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