btrfs: merge _btrfs_set_prop helpers

btrfs_set_prop() is a redirect to __btrfs_set_prop() with the
transaction handle equal to NULL.  __btrfs_set_prop() in turn passes
this to do_setxattr() which then transaction is actually created.

Instead merge  __btrfs_set_prop() to btrfs_set_prop(), and update the
caller with NULL argument.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index cd4e693..c156678 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -284,7 +284,8 @@ static int btrfs_ioctl_setflags(struct file *file, void __user *arg)
                binode->flags &= ~BTRFS_INODE_COMPRESS;
                binode->flags |= BTRFS_INODE_NOCOMPRESS;
 
-               ret = btrfs_set_prop(inode, "btrfs.compression", NULL, 0, 0);
+               ret = btrfs_set_prop(NULL, inode, "btrfs.compression", NULL, 0,
+                                    0);
                if (ret && ret != -ENODATA)
                        goto out_drop;
        } else if (fsflags & FS_COMPR_FL) {
@@ -302,13 +303,14 @@ static int btrfs_ioctl_setflags(struct file *file, void __user *arg)
                if (!comp || comp[0] == 0)
                        comp = btrfs_compress_type2str(BTRFS_COMPRESS_ZLIB);
 
-               ret = btrfs_set_prop(inode, "btrfs.compression",
-                                    comp, strlen(comp), 0);
+               ret = btrfs_set_prop(NULL, inode, "btrfs.compression", comp,
+                                    strlen(comp), 0);
                if (ret)
                        goto out_drop;
 
        } else {
-               ret = btrfs_set_prop(inode, "btrfs.compression", NULL, 0, 0);
+               ret = btrfs_set_prop(NULL, inode, "btrfs.compression", NULL, 0,
+                                    0);
                if (ret && ret != -ENODATA)
                        goto out_drop;
                binode->flags &= ~(BTRFS_INODE_COMPRESS | BTRFS_INODE_NOCOMPRESS);

diff --git a/fs/btrfs/props.c b/fs/btrfs/props.c
index 61d22a5..e9aa7ac 100644 (file)
--- a/fs/btrfs/props.c
+++ b/fs/btrfs/props.c
@@ -85,12 +85,9 @@ find_prop_handler(const char *name,
        return NULL;
 }
 
-static int __btrfs_set_prop(struct btrfs_trans_handle *trans,
-                           struct inode *inode,
-                           const char *name,
-                           const char *value,
-                           size_t value_len,
-                           int flags)
+int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode,
+                  const char *name, const char *value, size_t value_len,
+                  int flags)
 {
        const struct prop_handler *handler;
        int ret;
@@ -133,15 +130,6 @@ static int __btrfs_set_prop(struct btrfs_trans_handle *trans,
        return 0;
 }
 
-int btrfs_set_prop(struct inode *inode,
-                  const char *name,
-                  const char *value,
-                  size_t value_len,
-                  int flags)
-{
-       return __btrfs_set_prop(NULL, inode, name, value, value_len, flags);
-}
-
 static int iterate_object_props(struct btrfs_root *root,
                                struct btrfs_path *path,
                                u64 objectid,
@@ -313,8 +301,8 @@ static int inherit_props(struct btrfs_trans_handle *trans,
                                          num_bytes, BTRFS_RESERVE_NO_FLUSH);
                if (ret)
                        goto out;
-               ret = __btrfs_set_prop(trans, inode, h->xattr_name,
-                                      value, strlen(value), 0);
+               ret = btrfs_set_prop(trans, inode, h->xattr_name, value,
+                                    strlen(value), 0);
                btrfs_block_rsv_release(fs_info, trans->block_rsv, num_bytes);
                if (ret)
                        goto out;

diff --git a/fs/btrfs/props.h b/fs/btrfs/props.h
index 618815b..9dbdae4 100644 (file)
--- a/fs/btrfs/props.h
+++ b/fs/btrfs/props.h
@@ -10,10 +10,8 @@
 
 void __init btrfs_props_init(void);
 
-int btrfs_set_prop(struct inode *inode,
-                  const char *name,
-                  const char *value,
-                  size_t value_len,
+int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode,
+                  const char *name, const char *value, size_t value_len,
                   int flags);
 
 int btrfs_load_inode_props(struct inode *inode, struct btrfs_path *path);

diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c
index f141b45..499bb79 100644 (file)
--- a/fs/btrfs/xattr.c
+++ b/fs/btrfs/xattr.c
@@ -379,7 +379,7 @@ static int btrfs_xattr_handler_set_prop(const struct xattr_handler *handler,
                                        size_t size, int flags)
 {
        name = xattr_full_name(handler, name);
-       return btrfs_set_prop(inode, name, value, size, flags);
+       return btrfs_set_prop(NULL, inode, name, value, size, flags);
 }
 
 static const struct xattr_handler btrfs_security_xattr_handler = {