Merge branch 'btrfs-3.0' into for-linus

This commit is contained in:
Chris Mason 2011-09-20 14:49:29 -04:00
commit 0a7a0519d1

View file

@ -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;