aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/ioctl.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/btrfs/ioctl.c')
-rw-r--r--fs/btrfs/ioctl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index b0134892dc70..383ab455bfa7 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -4525,7 +4525,7 @@ static int btrfs_ioctl_set_fslabel(struct file *file, void __user *arg)
4525 spin_lock(&root->fs_info->super_lock); 4525 spin_lock(&root->fs_info->super_lock);
4526 strcpy(super_block->label, label); 4526 strcpy(super_block->label, label);
4527 spin_unlock(&root->fs_info->super_lock); 4527 spin_unlock(&root->fs_info->super_lock);
4528 ret = btrfs_end_transaction(trans, root); 4528 ret = btrfs_commit_transaction(trans, root);
4529 4529
4530out_unlock: 4530out_unlock:
4531 mnt_drop_write_file(file); 4531 mnt_drop_write_file(file);
@@ -4668,7 +4668,7 @@ static int btrfs_ioctl_set_features(struct file *file, void __user *arg)
4668 if (ret) 4668 if (ret)
4669 return ret; 4669 return ret;
4670 4670
4671 trans = btrfs_start_transaction(root, 1); 4671 trans = btrfs_start_transaction(root, 0);
4672 if (IS_ERR(trans)) 4672 if (IS_ERR(trans))
4673 return PTR_ERR(trans); 4673 return PTR_ERR(trans);
4674 4674
@@ -4689,7 +4689,7 @@ static int btrfs_ioctl_set_features(struct file *file, void __user *arg)
4689 btrfs_set_super_incompat_flags(super_block, newflags); 4689 btrfs_set_super_incompat_flags(super_block, newflags);
4690 spin_unlock(&root->fs_info->super_lock); 4690 spin_unlock(&root->fs_info->super_lock);
4691 4691
4692 return btrfs_end_transaction(trans, root); 4692 return btrfs_commit_transaction(trans, root);
4693} 4693}
4694 4694
4695long btrfs_ioctl(struct file *file, unsigned int 4695long btrfs_ioctl(struct file *file, unsigned int