On 27 Jul 2021 at 11:50, Allison Henderson wrote: > Now that xfs_attr_rmtval_remove is gone, rename __xfs_attr_rmtval_remove > to xfs_attr_rmtval_remove > That was simple enough. Reviewed-by: Chandan Babu R <chandanrlinux@xxxxxxxxx> > Signed-off-by: Allison Henderson <allison.henderson@xxxxxxxxxx> > Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx> > --- > fs/xfs/libxfs/xfs_attr.c | 6 +++--- > fs/xfs/libxfs/xfs_attr_remote.c | 2 +- > fs/xfs/libxfs/xfs_attr_remote.h | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c > index b0c6c62..5ff0320 100644 > --- a/fs/xfs/libxfs/xfs_attr.c > +++ b/fs/xfs/libxfs/xfs_attr.c > @@ -502,7 +502,7 @@ xfs_attr_set_iter( > /* Set state in case xfs_attr_rmtval_remove returns -EAGAIN */ > dac->dela_state = XFS_DAS_RM_LBLK; > if (args->rmtblkno) { > - error = __xfs_attr_rmtval_remove(dac); > + error = xfs_attr_rmtval_remove(dac); > if (error == -EAGAIN) > trace_xfs_attr_set_iter_return( > dac->dela_state, args->dp); > @@ -615,7 +615,7 @@ xfs_attr_set_iter( > /* Set state in case xfs_attr_rmtval_remove returns -EAGAIN */ > dac->dela_state = XFS_DAS_RM_NBLK; > if (args->rmtblkno) { > - error = __xfs_attr_rmtval_remove(dac); > + error = xfs_attr_rmtval_remove(dac); > if (error == -EAGAIN) > trace_xfs_attr_set_iter_return( > dac->dela_state, args->dp); > @@ -1447,7 +1447,7 @@ xfs_attr_remove_iter( > * May return -EAGAIN. Roll and repeat until all remote > * blocks are removed. > */ > - error = __xfs_attr_rmtval_remove(dac); > + error = xfs_attr_rmtval_remove(dac); > if (error == -EAGAIN) { > trace_xfs_attr_remove_iter_return( > dac->dela_state, args->dp); > diff --git a/fs/xfs/libxfs/xfs_attr_remote.c b/fs/xfs/libxfs/xfs_attr_remote.c > index 70f880d..1669043 100644 > --- a/fs/xfs/libxfs/xfs_attr_remote.c > +++ b/fs/xfs/libxfs/xfs_attr_remote.c > @@ -672,7 +672,7 @@ xfs_attr_rmtval_invalidate( > * routine until it returns something other than -EAGAIN. > */ > 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 61b85b9..d72eff3 100644 > --- a/fs/xfs/libxfs/xfs_attr_remote.h > +++ b/fs/xfs/libxfs/xfs_attr_remote.h > @@ -12,7 +12,7 @@ int xfs_attr_rmtval_get(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); -- chandan