]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
Btrfs: remove redundant check for swapfiles when reflinking
authorFilipe Manana <fdmanana@suse.com>
Tue, 8 Jan 2019 11:43:18 +0000 (11:43 +0000)
committerDavid Sterba <dsterba@suse.com>
Mon, 25 Feb 2019 13:13:20 +0000 (14:13 +0100)
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 <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/ioctl.c

index 4b5619127435c128147f9deb3799e30aff93fae7..816fa7dce79f5d3aa0d8c56279b325454ec45c49 100644 (file)
@@ -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