Re: [PATCH v9 24/24] xfs: Rename __xfs_attr_rmtval_remove

[Allison Collins <allison.henderson@xxxxxxxxxx>]

On 5/4/20 12:34 PM, Darrick J. Wong wrote:
> On Thu, Apr 30, 2020 at 03:50:16PM -0700, Allison Collins wrote:
> > Now that xfs_attr_rmtval_remove is gone, rename __xfs_attr_rmtval_remove
> > to xfs_attr_rmtval_remove
> >
> > Signed-off-by: Allison Collins <allison.henderson@xxxxxxxxxx>
>
> Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
Thanks!
Allison

> --D
>
> > ---
> >   fs/xfs/libxfs/xfs_attr.c        | 7 +++----
> >   fs/xfs/libxfs/xfs_attr_remote.c | 2 +-
> >   fs/xfs/libxfs/xfs_attr_remote.h | 3 +--
> >   3 files changed, 5 insertions(+), 7 deletions(-)
> >
> > diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
> > index 0751231..d76a970 100644
> > --- a/fs/xfs/libxfs/xfs_attr.c
> > +++ b/fs/xfs/libxfs/xfs_attr.c
> > @@ -874,7 +874,7 @@ xfs_attr_leaf_addname(
> >   		return error;
> >   das_rm_lblk:
> >   	if (args->rmtblkno) {
> > -		error = __xfs_attr_rmtval_remove(dac);
> > +		error = xfs_attr_rmtval_remove(dac);
> >   
> >   		if (error == -EAGAIN) {
> >   			dac->dela_state = XFS_DAS_RM_LBLK;
> > @@ -1244,8 +1244,7 @@ xfs_attr_node_addname(
> >   
> >   das_rm_nblk:
> >   	if (args->rmtblkno) {
> > -		error = __xfs_attr_rmtval_remove(dac);
> > -
> > +		error = xfs_attr_rmtval_remove(dac);
> >   		if (error == -EAGAIN) {
> >   			dac->dela_state = XFS_DAS_RM_NBLK;
> >   			return -EAGAIN;
> > @@ -1409,7 +1408,7 @@ xfs_attr_node_removename_rmt (
> >   	/*
> >   	 * May return -EAGAIN to request that the caller recall this function
> >   	 */
> > -	error = __xfs_attr_rmtval_remove(dac);
> > +	error = xfs_attr_rmtval_remove(dac);
> >   	if (error)
> >   		return error;
> >   
> > diff --git a/fs/xfs/libxfs/xfs_attr_remote.c b/fs/xfs/libxfs/xfs_attr_remote.c
> > index 7a342f1..21c7aa9 100644
> > --- a/fs/xfs/libxfs/xfs_attr_remote.c
> > +++ b/fs/xfs/libxfs/xfs_attr_remote.c
> > @@ -740,7 +740,7 @@ xfs_attr_rmtval_invalidate(
> >    * transaction and recall the function
> >    */
> >   int
> > -__xfs_attr_rmtval_remove(
> > +xfs_attr_rmtval_remove(
> >   	struct xfs_delattr_context	*dac)
> >   {
> >   	struct xfs_da_args		*args = dac->da_args;
> > diff --git a/fs/xfs/libxfs/xfs_attr_remote.h b/fs/xfs/libxfs/xfs_attr_remote.h
> > index 51a1c91..09fda56 100644
> > --- a/fs/xfs/libxfs/xfs_attr_remote.h
> > +++ b/fs/xfs/libxfs/xfs_attr_remote.h
> > @@ -10,11 +10,10 @@ int xfs_attr3_rmt_blocks(struct xfs_mount *mp, int attrlen);
> >   
> >   int xfs_attr_rmtval_get(struct xfs_da_args *args);
> >   int xfs_attr_rmtval_set(struct xfs_da_args *args);
> > -int xfs_attr_rmtval_remove(struct xfs_da_args *args);
> >   int xfs_attr_rmtval_stale(struct xfs_inode *ip, struct xfs_bmbt_irec *map,
> >   		xfs_buf_flags_t incore_flags);
> >   int xfs_attr_rmtval_invalidate(struct xfs_da_args *args);
> > -int __xfs_attr_rmtval_remove(struct xfs_delattr_context *dac);
> > +int xfs_attr_rmtval_remove(struct xfs_delattr_context *dac);
> >   int xfs_attr_rmt_find_hole(struct xfs_da_args *args);
> >   int xfs_attr_rmtval_set_value(struct xfs_da_args *args);
> >   int xfs_attr_rmtval_set_blk(struct xfs_delattr_context *dac);
> > --
> > 2.7.4