Merge branch 'btrfs-3.0' into for-linus

mariux64 · Sep 20, 2011 · 0a7a051 · 0a7a051
2 parents a66e7cc + b6f3409
commit 0a7a051
Showing 1 changed file with 6 additions and 1 deletion.
diff --git 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;