Commit 7852781d authored by David Sterba's avatar David Sterba

btrfs: drop underscores from exported xattr functions

Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent ffa7c429
...@@ -46,12 +46,12 @@ struct posix_acl *btrfs_get_acl(struct inode *inode, int type) ...@@ -46,12 +46,12 @@ struct posix_acl *btrfs_get_acl(struct inode *inode, int type)
BUG(); BUG();
} }
size = __btrfs_getxattr(inode, name, "", 0); size = btrfs_getxattr(inode, name, "", 0);
if (size > 0) { if (size > 0) {
value = kzalloc(size, GFP_KERNEL); value = kzalloc(size, GFP_KERNEL);
if (!value) if (!value)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
size = __btrfs_getxattr(inode, name, value, size); size = btrfs_getxattr(inode, name, value, size);
} }
if (size > 0) { if (size > 0) {
acl = posix_acl_from_xattr(&init_user_ns, value, size); acl = posix_acl_from_xattr(&init_user_ns, value, size);
...@@ -101,7 +101,7 @@ static int __btrfs_set_acl(struct btrfs_trans_handle *trans, ...@@ -101,7 +101,7 @@ static int __btrfs_set_acl(struct btrfs_trans_handle *trans,
goto out; goto out;
} }
ret = __btrfs_setxattr(trans, inode, name, value, size, 0); ret = btrfs_setxattr(trans, inode, name, value, size, 0);
out: out:
kfree(value); kfree(value);
......
...@@ -116,7 +116,7 @@ static int __btrfs_set_prop(struct btrfs_trans_handle *trans, ...@@ -116,7 +116,7 @@ static int __btrfs_set_prop(struct btrfs_trans_handle *trans,
return -EINVAL; return -EINVAL;
if (value_len == 0) { if (value_len == 0) {
ret = __btrfs_setxattr(trans, inode, handler->xattr_name, ret = btrfs_setxattr(trans, inode, handler->xattr_name,
NULL, 0, flags); NULL, 0, flags);
if (ret) if (ret)
return ret; return ret;
...@@ -130,13 +130,13 @@ static int __btrfs_set_prop(struct btrfs_trans_handle *trans, ...@@ -130,13 +130,13 @@ static int __btrfs_set_prop(struct btrfs_trans_handle *trans,
ret = handler->validate(value, value_len); ret = handler->validate(value, value_len);
if (ret) if (ret)
return ret; return ret;
ret = __btrfs_setxattr(trans, inode, handler->xattr_name, ret = btrfs_setxattr(trans, inode, handler->xattr_name,
value, value_len, flags); value, value_len, flags);
if (ret) if (ret)
return ret; return ret;
ret = handler->apply(inode, value, value_len); ret = handler->apply(inode, value, value_len);
if (ret) { if (ret) {
__btrfs_setxattr(trans, inode, handler->xattr_name, btrfs_setxattr(trans, inode, handler->xattr_name,
NULL, 0, flags); NULL, 0, flags);
return ret; return ret;
} }
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "locking.h" #include "locking.h"
ssize_t __btrfs_getxattr(struct inode *inode, const char *name, ssize_t btrfs_getxattr(struct inode *inode, const char *name,
void *buffer, size_t size) void *buffer, size_t size)
{ {
struct btrfs_dir_item *di; struct btrfs_dir_item *di;
...@@ -233,7 +233,7 @@ static int do_setxattr(struct btrfs_trans_handle *trans, ...@@ -233,7 +233,7 @@ static int do_setxattr(struct btrfs_trans_handle *trans,
/* /*
* @value: "" makes the attribute to empty, NULL removes it * @value: "" makes the attribute to empty, NULL removes it
*/ */
int __btrfs_setxattr(struct btrfs_trans_handle *trans, int btrfs_setxattr(struct btrfs_trans_handle *trans,
struct inode *inode, const char *name, struct inode *inode, const char *name,
const void *value, size_t size, int flags) const void *value, size_t size, int flags)
{ {
...@@ -374,7 +374,7 @@ static int btrfs_xattr_handler_get(const struct xattr_handler *handler, ...@@ -374,7 +374,7 @@ static int btrfs_xattr_handler_get(const struct xattr_handler *handler,
const char *name, void *buffer, size_t size) const char *name, void *buffer, size_t size)
{ {
name = xattr_full_name(handler, name); name = xattr_full_name(handler, name);
return __btrfs_getxattr(inode, name, buffer, size); return btrfs_getxattr(inode, name, buffer, size);
} }
static int btrfs_xattr_handler_set(const struct xattr_handler *handler, static int btrfs_xattr_handler_set(const struct xattr_handler *handler,
...@@ -383,7 +383,7 @@ static int btrfs_xattr_handler_set(const struct xattr_handler *handler, ...@@ -383,7 +383,7 @@ static int btrfs_xattr_handler_set(const struct xattr_handler *handler,
size_t size, int flags) size_t size, int flags)
{ {
name = xattr_full_name(handler, name); name = xattr_full_name(handler, name);
return __btrfs_setxattr(NULL, inode, name, buffer, size, flags); return btrfs_setxattr(NULL, inode, name, buffer, size, flags);
} }
static int btrfs_xattr_handler_set_prop(const struct xattr_handler *handler, static int btrfs_xattr_handler_set_prop(const struct xattr_handler *handler,
...@@ -448,8 +448,8 @@ static int btrfs_initxattrs(struct inode *inode, ...@@ -448,8 +448,8 @@ static int btrfs_initxattrs(struct inode *inode,
} }
strcpy(name, XATTR_SECURITY_PREFIX); strcpy(name, XATTR_SECURITY_PREFIX);
strcpy(name + XATTR_SECURITY_PREFIX_LEN, xattr->name); strcpy(name + XATTR_SECURITY_PREFIX_LEN, xattr->name);
err = __btrfs_setxattr(trans, inode, name, err = btrfs_setxattr(trans, inode, name, xattr->value,
xattr->value, xattr->value_len, 0); xattr->value_len, 0);
kfree(name); kfree(name);
if (err < 0) if (err < 0)
break; break;
......
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
extern const struct xattr_handler *btrfs_xattr_handlers[]; extern const struct xattr_handler *btrfs_xattr_handlers[];
extern ssize_t __btrfs_getxattr(struct inode *inode, const char *name, extern ssize_t btrfs_getxattr(struct inode *inode, const char *name,
void *buffer, size_t size); void *buffer, size_t size);
extern int __btrfs_setxattr(struct btrfs_trans_handle *trans, extern int btrfs_setxattr(struct btrfs_trans_handle *trans,
struct inode *inode, const char *name, struct inode *inode, const char *name,
const void *value, size_t size, int flags); const void *value, size_t size, int flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment