| Message ID | 20210525195504.7332-15-allison.henderson@oracle.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Delay Ready Attributes | expand |
On Tue, May 25, 2021 at 12:55:04PM -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 7294a2e..20b1e3c 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; > @@ -839,7 +839,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; > /* > @@ -1222,7 +1222,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. > @@ -1338,7 +1338,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) > { > @@ -1389,7 +1389,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); > @@ -1442,7 +1442,7 @@ xfs_attr_remove_iter( > > /* fallthrough */ > case XFS_DAS_RM_NAME: > - 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 >
On 26 May 2021 at 01:25, 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 > Looks good. Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com> > Suggested-by: Darrick J. Wong <djwong@kernel.org> > Signed-off-by: Allison Henderson <allison.henderson@oracle.com> > --- > 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 7294a2e..20b1e3c 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; > @@ -839,7 +839,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; > /* > @@ -1222,7 +1222,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. > @@ -1338,7 +1338,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) > { > @@ -1389,7 +1389,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); > @@ -1442,7 +1442,7 @@ xfs_attr_remove_iter( > > /* fallthrough */ > case XFS_DAS_RM_NAME: > - 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);
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c index 7294a2e..20b1e3c 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; @@ -839,7 +839,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; /* @@ -1222,7 +1222,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. @@ -1338,7 +1338,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) { @@ -1389,7 +1389,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); @@ -1442,7 +1442,7 @@ xfs_attr_remove_iter( /* fallthrough */ case XFS_DAS_RM_NAME: - 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);
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> --- 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(-)