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

Commit 6095028b authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Dave Chinner
Browse files

vfs: rename clone_verify_area to remap_verify_area 



Since we use clone_verify_area for both clone and dedupe range checks,
rename the function to make it clear that it's for both.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent a83ab01a

fs/read_write.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -1686,7 +1686,7 @@ SYSCALL_DEFINE6(copy_file_range, int, fd_in, loff_t __user *, off_in, 
	return ret;

	return ret;

}

}





static int clone_verify_area(struct file *file, loff_t pos, u64 len, bool write)

static int remap_verify_area(struct file *file, loff_t pos, u64 len, bool write)

{

{

	struct inode *inode = file_inode(file);

	struct inode *inode = file_inode(file);
@@ -1852,11 +1852,11 @@ int do_clone_file_range(struct file *file_in, loff_t pos_in, 
	if (!file_in->f_op->clone_file_range)

	if (!file_in->f_op->clone_file_range)

		return -EOPNOTSUPP;

		return -EOPNOTSUPP;





	ret = clone_verify_area(file_in, pos_in, len, false);

	ret = remap_verify_area(file_in, pos_in, len, false);

	if (ret)

	if (ret)

		return ret;

		return ret;





	ret = clone_verify_area(file_out, pos_out, len, true);

	ret = remap_verify_area(file_out, pos_out, len, true);

	if (ret)

	if (ret)

		return ret;

		return ret;
@@ -1989,7 +1989,7 @@ int vfs_dedupe_file_range_one(struct file *src_file, loff_t src_pos, 
	if (ret)

	if (ret)

		return ret;

		return ret;





	ret = clone_verify_area(dst_file, dst_pos, len, true);

	ret = remap_verify_area(dst_file, dst_pos, len, true);

	if (ret < 0)

	if (ret < 0)

		goto out_drop_write;

		goto out_drop_write;
@@ -2051,7 +2051,7 @@ int vfs_dedupe_file_range(struct file *file, struct file_dedupe_range *same) 
	if (!S_ISREG(src->i_mode))

	if (!S_ISREG(src->i_mode))

		goto out;

		goto out;





	ret = clone_verify_area(file, off, len, false);

	ret = remap_verify_area(file, off, len, false);

	if (ret < 0)

	if (ret < 0)

		goto out;

		goto out;

	ret = 0;

	ret = 0;