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

Commit 4d728ec7 authored by Li Zefan's avatar Li Zefan
Browse files

Btrfs: Fix file clone when source offset is not 0 



Suppose:
- the source extent is: [0, 100]
- the src offset is 10
- the clone length is 90
- the dest offset is 0

This statement:

	new_key.offset = key.offset + destoff - off

will produce such an extent for the dest file:

	[ino, BTRFS_EXTENT_DATA_KEY, -10]

, which is obviously wrong.

Signed-off-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
parent b897abec

fs/btrfs/ioctl.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -1788,7 +1788,10 @@ static noinline long btrfs_ioctl_clone(struct file *file, unsigned long srcfd, 




			memcpy(&new_key, &key, sizeof(new_key));

			memcpy(&new_key, &key, sizeof(new_key));

			new_key.objectid = inode->i_ino;

			new_key.objectid = inode->i_ino;

			if (off <= key.offset)

				new_key.offset = key.offset + destoff - off;

				new_key.offset = key.offset + destoff - off;

			else

				new_key.offset = destoff;





			trans = btrfs_start_transaction(root, 1);

			trans = btrfs_start_transaction(root, 1);

			if (IS_ERR(trans)) {

			if (IS_ERR(trans)) {