Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43a964a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://github.com/chrismason/linux 

* 'for-linus' of git://github.com/chrismason/linux:
  Btrfs: reserve sufficient space for ioctl clone
parents 80976804 0a7a0519

fs/btrfs/ioctl.c

+6 −1
Original line number Original line Diff line number Diff line
@@ -2328,7 +2328,12 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd, 
			else

			else

				new_key.offset = destoff;

				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)) {

			if (IS_ERR(trans)) {

				ret = PTR_ERR(trans);

				ret = PTR_ERR(trans);

				goto out;

				goto out;