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

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

vfs: rename vfs_clone_file_prep to be more descriptive 



The vfs_clone_file_prep is a generic function to be called by filesystem
implementations only.  Rename the prefix to generic_ and make it more
clear that it applies to remap operations, not just clones.

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 9aae2050

fs/ocfs2/refcounttree.c

+1 −1
Original line number Diff line number Diff line
@@ -4850,7 +4850,7 @@ int ocfs2_reflink_remap_range(struct file *file_in, 
	    (OCFS2_I(inode_out)->ip_flags & OCFS2_INODE_SYSTEM_FILE))

		goto out_unlock;



	ret = vfs_clone_file_prep(file_in, pos_in, file_out, pos_out,

	ret = generic_remap_file_range_prep(file_in, pos_in, file_out, pos_out,

			&len, is_dedupe);

	if (ret <= 0)

		goto out_unlock;

fs/read_write.c

+4 −4
Original line number Diff line number Diff line
@@ -1745,7 +1745,7 @@ static int generic_remap_check_len(struct inode *inode_in, 
 * Returns: 0 for "nothing to clone", 1 for "something to clone", or

 * the usual negative error code.

 */

int vfs_clone_file_prep(struct file *file_in, loff_t pos_in,

int generic_remap_file_range_prep(struct file *file_in, loff_t pos_in,

				  struct file *file_out, loff_t pos_out,

				  u64 *len, bool is_dedupe)

{
@@ -1822,7 +1822,7 @@ int vfs_clone_file_prep(struct file *file_in, loff_t pos_in, 


	return 1;

}

EXPORT_SYMBOL(vfs_clone_file_prep);

EXPORT_SYMBOL(generic_remap_file_range_prep);



int do_clone_file_range(struct file *file_in, loff_t pos_in,

			struct file *file_out, loff_t pos_out, u64 len)

fs/xfs/xfs_reflink.c

+1 −1
Original line number Diff line number Diff line
@@ -1326,7 +1326,7 @@ xfs_reflink_remap_prep( 
	if (IS_DAX(inode_in) || IS_DAX(inode_out))

		goto out_unlock;



	ret = vfs_clone_file_prep(file_in, pos_in, file_out, pos_out,

	ret = generic_remap_file_range_prep(file_in, pos_in, file_out, pos_out,

			len, is_dedupe);

	if (ret <= 0)

		goto out_unlock;

include/linux/fs.h

+3 −3
Original line number Diff line number Diff line
@@ -1825,7 +1825,7 @@ extern ssize_t vfs_readv(struct file *, const struct iovec __user *, 
		unsigned long, loff_t *, rwf_t);

extern ssize_t vfs_copy_file_range(struct file *, loff_t , struct file *,

				   loff_t, size_t, unsigned int);

extern int vfs_clone_file_prep(struct file *file_in, loff_t pos_in,

extern int generic_remap_file_range_prep(struct file *file_in, loff_t pos_in,

					 struct file *file_out, loff_t pos_out,

					 u64 *count, bool is_dedupe);

extern int do_clone_file_range(struct file *file_in, loff_t pos_in,