Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-20 23:13:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

xfs: rename xfs_has_attr()

Browse Source 
xfs_has_attr() is poorly named. It has global scope as it is defined
in a header file, but it has no namespace scope that tells us what
it is checking has attributes. It's not even clear what "has_attr"
means, because what it is actually doing is an attribute fork lookup
to see if the attribute exists.

Upcoming patches use this "xfs_has_<foo>" namespace for global
filesystem features, which conflicts with this function.

Rename xfs_has_attr() to xfs_attr_lookup() and make it a static
function, freeing up the "xfs_has_" namespace for global scope
usage.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
This commit is contained in:
Dave Chinner 2021-08-18 18:46:25 -07:00 committed by Darrick J. Wong
parent 8cf07f3dd5
commit 51b495eba8
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -642,8 +642,8 @@ out:
/* /*
* Return EEXIST if attr is found, or ENOATTR if not * Return EEXIST if attr is found, or ENOATTR if not
*/ */
int static int
xfs_has_attr( xfs_attr_lookup(
struct xfs_da_args *args) struct xfs_da_args *args)
{ {
struct xfs_inode *dp = args->dp; struct xfs_inode *dp = args->dp;
@ -780,8 +780,8 @@ xfs_attr_set(
goto out_trans_cancel; goto out_trans_cancel;
} }
error = xfs_attr_lookup(args);
if (args->value) { if (args->value) {
error = xfs_has_attr(args);
if (error == -EEXIST && (args->attr_flags & XATTR_CREATE)) if (error == -EEXIST && (args->attr_flags & XATTR_CREATE))
goto out_trans_cancel; goto out_trans_cancel;
if (error == -ENOATTR && (args->attr_flags & XATTR_REPLACE)) if (error == -ENOATTR && (args->attr_flags & XATTR_REPLACE))
@ -796,7 +796,6 @@ xfs_attr_set(
if (!args->trans) if (!args->trans)
goto out_unlock; goto out_unlock;
} else { } else {
error = xfs_has_attr(args);
if (error != -EEXIST) if (error != -EEXIST)
goto out_trans_cancel; goto out_trans_cancel;

1
fs/xfs/libxfs/xfs_attr.h
View File

@ -490,7 +490,6 @@ int xfs_attr_get_ilocked(struct xfs_da_args *args);
int xfs_attr_get(struct xfs_da_args *args); int xfs_attr_get(struct xfs_da_args *args);
int xfs_attr_set(struct xfs_da_args *args); int xfs_attr_set(struct xfs_da_args *args);
int xfs_attr_set_args(struct xfs_da_args *args); int xfs_attr_set_args(struct xfs_da_args *args);
int xfs_has_attr(struct xfs_da_args *args);
int xfs_attr_remove_args(struct xfs_da_args *args); int xfs_attr_remove_args(struct xfs_da_args *args);
int xfs_attr_remove_iter(struct xfs_delattr_context *dac); int xfs_attr_remove_iter(struct xfs_delattr_context *dac);
bool xfs_attr_namecheck(const void *name, size_t length); bool xfs_attr_namecheck(const void *name, size_t length);