aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2011-09-20 14:49:29 -0400
committerChris Mason <chris.mason@oracle.com>2011-09-20 14:49:29 -0400
commit0a7a0519d1789f3a222849421dbe91b6bddb88f5 (patch)
treed9fee1dae1627f24de73bf6555030b6285c7c73a
parenta66e7cc626f42de6c745963fe0d807518fa49d39 (diff)
parentb6f3409b2197e8fcedb43e6600e37b7cfbe0715b (diff)
downloadlinux-stericsson-0a7a0519d1789f3a222849421dbe91b6bddb88f5.tar.gz
Merge branch 'btrfs-3.0' into for-linus
-rw-r--r--fs/btrfs/ioctl.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index d11fd28efa6a..538f65a79ec5 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -2328,7 +2328,12 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd,
else
new_key.offset = destoff;
- trans = btrfs_start_transaction(root, 1);
+ /*
+ * 1 - adjusting old extent (we may have to split it)
+ * 1 - add new extent
+ * 1 - inode update
+ */
+ trans = btrfs_start_transaction(root, 3);
if (IS_ERR(trans)) {
ret = PTR_ERR(trans);
goto out;