leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xfs: Make attr name schemes consistent

Browse Source 
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: Chandan Babu R <chandanrlinux@gmail.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
This commit is contained in:
Allison Henderson 2021-05-28 15:15:05 -07:00
parent 4a4957c16d
commit 816c8e39b7
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/xfs/libxfs/xfs_attr.c
View File

@ -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 @@ out:
}
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

2
fs/xfs/libxfs/xfs_attr_leaf.c
View File

@ -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;

2
fs/xfs/libxfs/xfs_attr_leaf.h
View File

@ -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);