On Tue, Jan 14, 2020 at 09:10:43AM +0100, Christoph Hellwig wrote:
> The version taking the context structure is the main interface to list
> attributes, so drop the _int postfix.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
--D
> ---
> fs/xfs/libxfs/xfs_attr.h | 4 ++--
> fs/xfs/scrub/attr.c | 4 ++--
> fs/xfs/xfs_attr_list.c | 6 +++---
> fs/xfs/xfs_ioctl.c | 2 +-
> fs/xfs/xfs_xattr.c | 2 +-
> 5 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h
> index 0e3c213f78ce..8d42f5782ff7 100644
> --- a/fs/xfs/libxfs/xfs_attr.h
> +++ b/fs/xfs/libxfs/xfs_attr.h
> @@ -102,8 +102,8 @@ struct xfs_attr_list_context {
> * Overall external interface routines.
> */
> int xfs_attr_inactive(struct xfs_inode *dp);
> -int xfs_attr_list_int_ilocked(struct xfs_attr_list_context *);
> -int xfs_attr_list_int(struct xfs_attr_list_context *);
> +int xfs_attr_list_ilocked(struct xfs_attr_list_context *);
> +int xfs_attr_list(struct xfs_attr_list_context *);
> int xfs_inode_hasattr(struct xfs_inode *ip);
> int xfs_attr_get_ilocked(struct xfs_da_args *args);
> int xfs_attr_get(struct xfs_da_args *args);
> diff --git a/fs/xfs/scrub/attr.c b/fs/xfs/scrub/attr.c
> index 05537627211d..9e336d797616 100644
> --- a/fs/xfs/scrub/attr.c
> +++ b/fs/xfs/scrub/attr.c
> @@ -98,7 +98,7 @@ struct xchk_xattr {
> /*
> * Check that an extended attribute key can be looked up by hash.
> *
> - * We use the XFS attribute list iterator (i.e. xfs_attr_list_int_ilocked)
> + * We use the XFS attribute list iterator (i.e. xfs_attr_list_ilocked)
> * to call this function for every attribute key in an inode. Once
> * we're here, we load the attribute value to see if any errors happen,
> * or if we get more or less data than we expected.
> @@ -516,7 +516,7 @@ xchk_xattr(
> * iteration, which doesn't really follow the usual buffer
> * locking order.
> */
> - error = xfs_attr_list_int_ilocked(&sx.context);
> + error = xfs_attr_list_ilocked(&sx.context);
> if (!xchk_fblock_process_error(sc, XFS_ATTR_FORK, 0, &error))
> goto out;
>
> diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c
> index 369ce1d3dd45..ea79219859a0 100644
> --- a/fs/xfs/xfs_attr_list.c
> +++ b/fs/xfs/xfs_attr_list.c
> @@ -507,7 +507,7 @@ xfs_attr_leaf_list(
> }
>
> int
> -xfs_attr_list_int_ilocked(
> +xfs_attr_list_ilocked(
> struct xfs_attr_list_context *context)
> {
> struct xfs_inode *dp = context->dp;
> @@ -527,7 +527,7 @@ xfs_attr_list_int_ilocked(
> }
>
> int
> -xfs_attr_list_int(
> +xfs_attr_list(
> struct xfs_attr_list_context *context)
> {
> struct xfs_inode *dp = context->dp;
> @@ -540,7 +540,7 @@ xfs_attr_list_int(
> return -EIO;
>
> lock_mode = xfs_ilock_attr_map_shared(dp);
> - error = xfs_attr_list_int_ilocked(context);
> + error = xfs_attr_list_ilocked(context);
> xfs_iunlock(dp, lock_mode);
> return error;
> }
> diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
> index 2e64dae3743f..639abd2bd723 100644
> --- a/fs/xfs/xfs_ioctl.c
> +++ b/fs/xfs/xfs_ioctl.c
> @@ -395,7 +395,7 @@ xfs_ioc_attr_list(
> alist->al_more = 0;
> alist->al_offset[0] = context.bufsize;
>
> - error = xfs_attr_list_int(&context);
> + error = xfs_attr_list(&context);
> ASSERT(error <= 0);
> return error;
> }
> diff --git a/fs/xfs/xfs_xattr.c b/fs/xfs/xfs_xattr.c
> index 8880dee3400f..e1951d2b878e 100644
> --- a/fs/xfs/xfs_xattr.c
> +++ b/fs/xfs/xfs_xattr.c
> @@ -232,7 +232,7 @@ xfs_vn_listxattr(
> context.firstu = context.bufsize;
> context.put_listent = xfs_xattr_put_listent;
>
> - error = xfs_attr_list_int(&context);
> + error = xfs_attr_list(&context);
> if (error)
> return error;
> if (context.count < 0)
> --
> 2.24.1
>
