summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/ioctl.c
diff options
context:
space:
mode:
authorAnand Jain <anand.jain@oracle.com>2019-02-28 23:34:50 -0500
committerDavid Sterba <dsterba@suse.com>2019-04-29 13:02:19 -0400
commit262c96a3c3670bf2322b9a0c9d74e2a3d9e43be0 (patch)
treec56c41250ae7c6418481c3b5bb00a2f260e14001 /fs/btrfs/ioctl.c
parent419a6f30fd84202494962cc9c47d2c5d8ef4f7c4 (diff)
btrfs: refactor btrfs_set_prop and add btrfs_set_prop_trans
btrfs_set_prop() takes transaction pointer as the first argument, however in ioctl.c for the purpose of setting the compression property, we call btrfs_set_prop() with NULL transaction pointer. Down in the call chain btrfs_setxattr() starts transaction to update the attribute and also to update the inode. So for clarity, create btrfs_set_prop_trans() with no transaction pointer as argument, in preparation to start transaction here instead of doing it down the call chain at btrfs_setxattr(). Also now the btrfs_set_prop() is a static function. Signed-off-by: Anand Jain <anand.jain@oracle.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/ioctl.c')
-rw-r--r--fs/btrfs/ioctl.c12
1 files changed, 6 insertions, 6 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)
284 binode->flags &= ~BTRFS_INODE_COMPRESS; 284 binode->flags &= ~BTRFS_INODE_COMPRESS;
285 binode->flags |= BTRFS_INODE_NOCOMPRESS; 285 binode->flags |= BTRFS_INODE_NOCOMPRESS;
286 286
287 ret = btrfs_set_prop(NULL, inode, "btrfs.compression", NULL, 0, 287 ret = btrfs_set_prop_trans(inode, "btrfs.compression", NULL,
288 0); 288 0, 0);
289 if (ret && ret != -ENODATA) 289 if (ret && ret != -ENODATA)
290 goto out_drop; 290 goto out_drop;
291 } else if (fsflags & FS_COMPR_FL) { 291 } else if (fsflags & FS_COMPR_FL) {
@@ -303,14 +303,14 @@ static int btrfs_ioctl_setflags(struct file *file, void __user *arg)
303 if (!comp || comp[0] == 0) 303 if (!comp || comp[0] == 0)
304 comp = btrfs_compress_type2str(BTRFS_COMPRESS_ZLIB); 304 comp = btrfs_compress_type2str(BTRFS_COMPRESS_ZLIB);
305 305
306 ret = btrfs_set_prop(NULL, inode, "btrfs.compression", comp, 306 ret = btrfs_set_prop_trans(inode, "btrfs.compression", comp,
307 strlen(comp), 0); 307 strlen(comp), 0);
308 if (ret) 308 if (ret)
309 goto out_drop; 309 goto out_drop;
310 310
311 } else { 311 } else {
312 ret = btrfs_set_prop(NULL, inode, "btrfs.compression", NULL, 0, 312 ret = btrfs_set_prop_trans(inode, "btrfs.compression", NULL,
313 0); 313 0, 0);
314 if (ret && ret != -ENODATA) 314 if (ret && ret != -ENODATA)
315 goto out_drop; 315 goto out_drop;
316 binode->flags &= ~(BTRFS_INODE_COMPRESS | BTRFS_INODE_NOCOMPRESS); 316 binode->flags &= ~(BTRFS_INODE_COMPRESS | BTRFS_INODE_NOCOMPRESS);