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

Commit 71ef0786 authored by Li Zefan's avatar Li Zefan Committed by Chris Mason
Browse files

Btrfs: fix pages truncation in btrfs_ioctl_clone() 



It's a bug in commit f81c9cdc
(Btrfs: truncate pages from clone ioctl target range)

We should pass the dest range to the truncate function, but not the
src range.

Also move the function before locking extent state.

Signed-off-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 3765fefa

fs/btrfs/ioctl.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -2234,6 +2234,10 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd, 
			goto out_unlock;

			goto out_unlock;

	}

	}





	/* truncate page cache pages from target inode range */

	truncate_inode_pages_range(&inode->i_data, destoff,

				   PAGE_CACHE_ALIGN(destoff + len) - 1);



	/* do any pending delalloc/csum calc on src, one way or

	/* do any pending delalloc/csum calc on src, one way or

	   another, and lock file content */

	   another, and lock file content */

	while (1) {

	while (1) {
@@ -2250,10 +2254,6 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd, 
		btrfs_wait_ordered_range(src, off, len);

		btrfs_wait_ordered_range(src, off, len);

	}

	}





	/* truncate page cache pages from target inode range */

	truncate_inode_pages_range(&inode->i_data, off,

				   ALIGN(off + len, PAGE_CACHE_SIZE) - 1);



	/* clone data */

	/* clone data */

	key.objectid = btrfs_ino(src);

	key.objectid = btrfs_ino(src);

	key.type = BTRFS_EXTENT_DATA_KEY;

	key.type = BTRFS_EXTENT_DATA_KEY;