btrfs: drop underscores from exported xattr functions

Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index 1ba49ebe67da39f6daf0a9a6f0ff63fff8554935..f8a1bdf06b2ab9bacf4e05d82704405932e9ea58 100644 (file)
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -46,12 +46,12 @@ struct posix_acl *btrfs_get_acl(struct inode *inode, int type)
                BUG();
        }
 
-       size = __btrfs_getxattr(inode, name, "", 0);
+       size = btrfs_getxattr(inode, name, "", 0);
        if (size > 0) {
                value = kzalloc(size, GFP_KERNEL);
                if (!value)
                        return ERR_PTR(-ENOMEM);
-               size = __btrfs_getxattr(inode, name, value, size);
+               size = btrfs_getxattr(inode, name, value, size);
        }
        if (size > 0) {
                acl = posix_acl_from_xattr(&init_user_ns, value, size);
@@ -101,7 +101,7 @@ static int __btrfs_set_acl(struct btrfs_trans_handle *trans,
                        goto out;
        }
 
-       ret = __btrfs_setxattr(trans, inode, name, value, size, 0);
+       ret = btrfs_setxattr(trans, inode, name, value, size, 0);
 out:
        kfree(value);
 

diff --git a/fs/btrfs/props.c b/fs/btrfs/props.c
index e4ac2417552472052e14bf2401cf0fbc2fc84129..5859f7d3cf3e5c28e78bce1dbfea8367f7bb859d 100644 (file)
--- a/fs/btrfs/props.c
+++ b/fs/btrfs/props.c
@@ -116,7 +116,7 @@ static int __btrfs_set_prop(struct btrfs_trans_handle *trans,
                return -EINVAL;
 
        if (value_len == 0) {
-               ret = __btrfs_setxattr(trans, inode, handler->xattr_name,
+               ret = btrfs_setxattr(trans, inode, handler->xattr_name,
                                       NULL, 0, flags);
                if (ret)
                        return ret;
@@ -130,13 +130,13 @@ static int __btrfs_set_prop(struct btrfs_trans_handle *trans,
        ret = handler->validate(value, value_len);
        if (ret)
                return ret;
-       ret = __btrfs_setxattr(trans, inode, handler->xattr_name,
+       ret = btrfs_setxattr(trans, inode, handler->xattr_name,
                               value, value_len, flags);
        if (ret)
                return ret;
        ret = handler->apply(inode, value, value_len);
        if (ret) {
-               __btrfs_setxattr(trans, inode, handler->xattr_name,
+               btrfs_setxattr(trans, inode, handler->xattr_name,
                                 NULL, 0, flags);
                return ret;
        }

diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c
index de7d072c78efaaf7f357dc57266cf840bd5c68c2..414ccbe26c71594befe6edd860469c40e60d8a93 100644 (file)
--- a/fs/btrfs/xattr.c
+++ b/fs/btrfs/xattr.c
@@ -33,7 +33,7 @@
 #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)
 {
        struct btrfs_dir_item *di;
@@ -233,7 +233,7 @@ out:
 /*
  * @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,
                     const void *value, size_t size, int flags)
 {
@@ -374,7 +374,7 @@ static int btrfs_xattr_handler_get(const struct xattr_handler *handler,
                                   const char *name, void *buffer, size_t size)
 {
        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,
@@ -383,7 +383,7 @@ static int btrfs_xattr_handler_set(const struct xattr_handler *handler,
                                   size_t size, int flags)
 {
        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,
@@ -448,8 +448,8 @@ static int btrfs_initxattrs(struct inode *inode,
                }
                strcpy(name, XATTR_SECURITY_PREFIX);
                strcpy(name + XATTR_SECURITY_PREFIX_LEN, xattr->name);
-               err = __btrfs_setxattr(trans, inode, name,
-                                      xattr->value, xattr->value_len, 0);
+               err = btrfs_setxattr(trans, inode, name, xattr->value,
+                               xattr->value_len, 0);
                kfree(name);
                if (err < 0)
                        break;

diff --git a/fs/btrfs/xattr.h b/fs/btrfs/xattr.h
index 15fc4743dc7003339610ca04afefcf5a9978fe92..3c227c549dfcb68dc222d6fbb60a0adc2fb7b87f 100644 (file)
--- a/fs/btrfs/xattr.h
+++ b/fs/btrfs/xattr.h
@@ -23,9 +23,9 @@
 
 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);
-extern int __btrfs_setxattr(struct btrfs_trans_handle *trans,
+extern int btrfs_setxattr(struct btrfs_trans_handle *trans,
                            struct inode *inode, const char *name,
                            const void *value, size_t size, int flags);