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

Commit 500710d3 authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

Btrfs: move duplicated nodatasum check into common reflink/dedupe helper 



Move the check that verifies if both inodes have checksums disabled or
both have them enabled, from the clone and deduplication functions into
the new common helper btrfs_remap_file_range_prep().

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 951e05a9

fs/btrfs/ioctl.c

+7 −10
Original line number Diff line number Diff line
@@ -3280,11 +3280,6 @@ static int btrfs_extent_same(struct inode *src, u64 loff, u64 olen, 
	int ret;

	u64 i, tail_len, chunk_count;



	/* don't make the dst file partly checksummed */

	if ((BTRFS_I(src)->flags & BTRFS_INODE_NODATASUM) !=

	    (BTRFS_I(dst)->flags & BTRFS_INODE_NODATASUM))

		return -EINVAL;



	tail_len = olen % BTRFS_MAX_DEDUPE_LEN;

	chunk_count = div_u64(olen, BTRFS_MAX_DEDUPE_LEN);
@@ -3902,11 +3897,6 @@ static noinline int btrfs_clone_files(struct file *file, struct file *file_src, 
	 *   be either compressed or non-compressed.

	 */



	/* don't make the dst file partly checksummed */

	if ((BTRFS_I(src)->flags & BTRFS_INODE_NODATASUM) !=

	    (BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM))

		return -EINVAL;



	/*

	 * 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
@@ -3982,6 +3972,13 @@ static int btrfs_remap_file_range_prep(struct file *file_in, loff_t pos_in, 
	else

		btrfs_double_inode_lock(inode_in, inode_out);



	/* don't make the dst file partly checksummed */

	if ((BTRFS_I(inode_in)->flags & BTRFS_INODE_NODATASUM) !=

	    (BTRFS_I(inode_out)->flags & BTRFS_INODE_NODATASUM)) {

		ret = -EINVAL;

		goto out_unlock;

	}



	/*

	 * Now that the inodes are locked, we need to start writeback ourselves

	 * and can not rely on the writeback from the VFS's generic helper