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

Commit 0f39b605 authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

Btrfs: remove redundant check for swapfiles when reflinking 



Checking if either of the inodes corresponds to a swapfile is already
performed by generic_remap_file_range_prep(), so we do not need to do
it in the btrfs clone and deduplication functions.

Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 420829d8

fs/btrfs/ioctl.c

+0 −6
Original line number Diff line number Diff line
@@ -3285,9 +3285,6 @@ static int btrfs_extent_same(struct inode *src, u64 loff, u64 olen, 
	    (BTRFS_I(dst)->flags & BTRFS_INODE_NODATASUM))

		return -EINVAL;



	if (IS_SWAPFILE(src) || IS_SWAPFILE(dst))

		return -ETXTBSY;



	tail_len = olen % BTRFS_MAX_DEDUPE_LEN;

	chunk_count = div_u64(olen, BTRFS_MAX_DEDUPE_LEN);
@@ -3910,9 +3907,6 @@ static noinline int btrfs_clone_files(struct file *file, struct file *file_src, 
	    (BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM))

		return -EINVAL;



	if (IS_SWAPFILE(src) || IS_SWAPFILE(inode))

		return -ETXTBSY;



	/*

	 * VFS's generic_remap_file_range_prep() protects us from cloning the

	 * eof block into the middle of a file, which would result in corruption