Btrfs: fix pages truncation in btrfs_ioctl_clone() (71ef0786) · Commits · 戴 / test

It's a bug in commit (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:

Li Zefan <lizf@cn.fujitsu.com> Signed-off-by:

Chris Mason <chris.mason@oracle.com>

fs/btrfs/ioctl.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -2234,6 +2234,10 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd,
		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
		another, and lock file content */
		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);
		}

		/* 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 */
		key.objectid = btrfs_ino(src);
		key.type = BTRFS_EXTENT_DATA_KEY;

Admin message