From: Filipe Manana Date: Tue, 8 Jan 2019 11:43:18 +0000 (+0000) Subject: Btrfs: remove redundant check for swapfiles when reflinking X-Git-Tag: v5.1-rc1~138^2~74 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f39b6056323e3d5e82cdef0f811713fe05fbb12;p=thirdparty%2Fkernel%2Flinux.git 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: Filipe Manana Reviewed-by: David Sterba Signed-off-by: David Sterba --- diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 4b5619127435c..816fa7dce79f5 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -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