btrfs: merge _btrfs_set_prop helpers

[linux-block.git] / fs / btrfs / props.c

diff --git a/fs/btrfs/props.c b/fs/btrfs/props.c
index 61d22a56c0ba4e7d43f0552854f4ac4e82443218..e9aa7ac0583eadbbcca27e19c55e4dd509b21fdb 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;