From: Chris Mason <chris.mason@oracle.com>
Date: Tue, 20 Sep 2011 18:49:29 +0000 (-0400)
Subject: Merge branch 'btrfs-3.0' into for-linus
X-Git-Tag: v3.1-rc7~9^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a7a0519d1789f3a222849421dbe91b6bddb88f5;hp=a66e7cc626f42de6c745963fe0d807518fa49d39;p=pandora-kernel.git

Merge branch 'btrfs-3.0' into for-linus
---

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;