When trans is not NULL btrfs_setxattr() calls do_setxattr()  directly
with a check for readonly root. Rename do_setxattr() btrfs_setxattr() in
preparation to call do_setxattr() directly instead.
Preparatory patch, no functional changes.

Signed-off-by: Anand Jain <anand.j...@oracle.com>
---
 fs/btrfs/xattr.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c
index 38eb78aac0a7..fd1469ef55d6 100644
--- a/fs/btrfs/xattr.c
+++ b/fs/btrfs/xattr.c
@@ -76,9 +76,9 @@ int btrfs_getxattr(struct inode *inode, const char *name,
        return ret;
 }
 
-static int do_setxattr(struct btrfs_trans_handle *trans,
-                      struct inode *inode, const char *name,
-                      const void *value, size_t size, int flags)
+static int btrfs_setxattr(struct btrfs_trans_handle *trans,
+                         struct inode *inode, const char *name,
+                         const void *value, size_t size, int flags)
 {
        struct btrfs_dir_item *di = NULL;
        struct btrfs_root *root = BTRFS_I(inode)->root;
@@ -231,13 +231,13 @@ int btrfs_setxattr_trans(struct btrfs_trans_handle *trans,
                return -EROFS;
 
        if (trans)
-               return do_setxattr(trans, inode, name, value, size, flags);
+               return btrfs_setxattr(trans, inode, name, value, size, flags);
 
        trans = btrfs_start_transaction(root, 2);
        if (IS_ERR(trans))
                return PTR_ERR(trans);
 
-       ret = do_setxattr(trans, inode, name, value, size, flags);
+       ret = btrfs_setxattr(trans, inode, name, value, size, flags);
        if (ret)
                goto out;
 
-- 
2.17.1

Reply via email to