aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/ioctl.c
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 /fs/btrfs/ioctl.c
parenta66e7cc626f42de6c745963fe0d807518fa49d39 (diff)
parentb6f3409b2197e8fcedb43e6600e37b7cfbe0715b (diff)
Merge branch 'btrfs-3.0' into for-linus
Diffstat (limited to 'fs/btrfs/ioctl.c')
-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,
2328 else 2328 else
2329 new_key.offset = destoff; 2329 new_key.offset = destoff;
2330 2330
2331 trans = btrfs_start_transaction(root, 1); 2331 /*
2332 * 1 - adjusting old extent (we may have to split it)
2333 * 1 - add new extent
2334 * 1 - inode update
2335 */
2336 trans = btrfs_start_transaction(root, 3);
2332 if (IS_ERR(trans)) { 2337 if (IS_ERR(trans)) {
2333 ret = PTR_ERR(trans); 2338 ret = PTR_ERR(trans);
2334 goto out; 2339 goto out;