4 files changed, 18 insertions, 13 deletions

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index c1566787a146..4d945b3d88e3 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -284,8 +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(NULL, inode, "btrfs.compression", NULL, 0,
-                                     0);
+                ret = btrfs_set_prop_trans(inode, "btrfs.compression", NULL,
+                                           0, 0);
                 if (ret && ret != -ENODATA)
                         goto out_drop;
         } else if (fsflags & FS_COMPR_FL) {
@@ -303,14 +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(NULL, inode, "btrfs.compression", comp,
-                                     strlen(comp), 0);
+                ret = btrfs_set_prop_trans(inode, "btrfs.compression", comp,
+                                           strlen(comp), 0);
                 if (ret)
                         goto out_drop;
 
         } else {
-                ret = btrfs_set_prop(NULL, inode, "btrfs.compression", NULL, 0,
-                                     0);
+                ret = btrfs_set_prop_trans(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 c52cd78fea31..722ccf6bdd2b 100644
--- a/fs/btrfs/props.c
+++ b/fs/btrfs/props.c
@@ -55,9 +55,9 @@ find_prop_handler(const char *name,
         return NULL;
 }
 
-int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode,
-                   const char *name, const char *value, size_t value_len,
-                   int flags)
+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)
 {
         const struct prop_handler *handler;
         int ret;
@@ -100,6 +100,12 @@ int btrfs_set_prop(struct btrfs_trans_handle *trans, struct inode *inode,
         return 0;
 }
 
+int btrfs_set_prop_trans(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,
diff --git a/fs/btrfs/props.h b/fs/btrfs/props.h
index 9dbdae47cf27..b1a6b233b774 100644
--- a/fs/btrfs/props.h
+++ b/fs/btrfs/props.h
@@ -10,9 +10,8 @@
 
 void __init btrfs_props_init(void);
 
-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_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 6971cbf286b5..69126d5b4d62 100644
--- 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(NULL, inode, name, value, size, flags);
+        return btrfs_set_prop_trans(inode, name, value, size, flags);
 }
 
 static const struct xattr_handler btrfs_security_xattr_handler = {