[PATCH 1/6] btrfs: rename btrfs_setxattr to btrfs_setxattr_trans

[Anand Jain]

Rename btrfs_setxattr() to btrfs_setxattr_trans(), so that do_setxattr()
can be renamed to btrfs_setxattr().
Preparatory patch, no functional changes.

Signed-off-by: Anand Jain <anand.j...@oracle.com>
---
 fs/btrfs/acl.c   |  2 +-
 fs/btrfs/props.c | 20 ++++++++++----------
 fs/btrfs/xattr.c | 12 ++++++------
 fs/btrfs/xattr.h |  2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index 5810463dc6d2..d3b04c6abc61 100644
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -93,7 +93,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(trans, inode, name, value, size, 0);
 out:
        kfree(value);
 
diff --git a/fs/btrfs/props.c b/fs/btrfs/props.c
index 0d1c3485c098..61ced0ebb5ba 100644
--- a/fs/btrfs/props.c
+++ b/fs/btrfs/props.c
@@ -70,8 +70,8 @@ static int btrfs_set_prop(struct btrfs_trans_handle *trans, 
struct inode *inode,
                return -EINVAL;
 
        if (value_len == 0) {
-               ret = btrfs_setxattr(trans, inode, handler->xattr_name,
-                                      NULL, 0, flags);
+               ret = btrfs_setxattr_trans(trans, inode, handler->xattr_name,
+                                          NULL, 0, flags);
                if (ret)
                        return ret;
 
@@ -84,14 +84,14 @@ static int btrfs_set_prop(struct btrfs_trans_handle *trans, 
struct inode *inode,
        ret = handler->validate(value, value_len);
        if (ret)
                return ret;
-       ret = btrfs_setxattr(trans, inode, handler->xattr_name,
-                              value, value_len, flags);
+       ret = btrfs_setxattr_trans(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,
-                                NULL, 0, flags);
+               btrfs_setxattr_trans(trans, inode, handler->xattr_name,
+                                    NULL, 0, flags);
                return ret;
        }
 
@@ -358,13 +358,13 @@ static int inherit_props(struct btrfs_trans_handle *trans,
                if (ret)
                        return ret;
 
-               ret = btrfs_setxattr(trans, inode, h->xattr_name, value,
-                                    strlen(value), 0);
+               ret = btrfs_setxattr_trans(trans, inode, h->xattr_name, value,
+                                          strlen(value), 0);
                if (!ret) {
                        ret = h->apply(inode, value, strlen(value));
                        if (ret)
-                               btrfs_setxattr(trans, inode, h->xattr_name,
-                                              NULL, 0, 0);
+                               btrfs_setxattr_trans(trans, inode, 
h->xattr_name,
+                                                    NULL, 0, 0);
                        else
                                set_bit(BTRFS_INODE_HAS_PROPS,
                                        &BTRFS_I(inode)->runtime_flags);
diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c
index fa820c56ba3e..38eb78aac0a7 100644
--- a/fs/btrfs/xattr.c
+++ b/fs/btrfs/xattr.c
@@ -220,9 +220,9 @@ static int do_setxattr(struct btrfs_trans_handle *trans,
 /*
  * @value: "" makes the attribute to empty, NULL removes it
  */
-int btrfs_setxattr(struct btrfs_trans_handle *trans,
-                    struct inode *inode, const char *name,
-                    const void *value, size_t size, int flags)
+int btrfs_setxattr_trans(struct btrfs_trans_handle *trans,
+                        struct inode *inode, const char *name,
+                        const void *value, size_t size, int flags)
 {
        struct btrfs_root *root = BTRFS_I(inode)->root;
        int ret;
@@ -370,7 +370,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_trans(NULL, inode, name, buffer, size, flags);
 }
 
 static int btrfs_xattr_handler_set_prop(const struct xattr_handler *handler,
@@ -441,8 +441,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(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 471fcac6ff55..36d54a15cbfe 100644
--- a/fs/btrfs/xattr.h
+++ b/fs/btrfs/xattr.h
@@ -12,7 +12,7 @@ extern const struct xattr_handler *btrfs_xattr_handlers[];
 
 int btrfs_getxattr(struct inode *inode, const char *name,
                void *buffer, size_t size);
-int btrfs_setxattr(struct btrfs_trans_handle *trans,
+int btrfs_setxattr_trans(struct btrfs_trans_handle *trans,
                            struct inode *inode, const char *name,
                            const void *value, size_t size, int flags);
 ssize_t btrfs_listxattr(struct dentry *dentry, char *buffer, size_t size);
-- 
2.17.1