Unverified Commit 705bcfcb authored by Amir Goldstein's avatar Amir Goldstein Committed by Christian Brauner
Browse files

fs: use splice_copy_file_range() inline helper 



generic_copy_file_range() is just a wrapper around splice_file_range(),
which caps the maximum copy length.

The only caller of splice_file_range(), namely __ceph_copy_file_range()
is already ready to cope with short copy.

Move the length capping into splice_file_range() and replace the exported
symbol generic_copy_file_range() with a simple inline helper.

Suggested-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/linux-fsdevel/20231204083849.GC32438@lst.de/


Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarAmir Goldstein <amir73il@gmail.com>
Link: https://lore.kernel.org/r/20231212094440.250945-3-amir73il@gmail.com


Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 0f292086

fs/ceph/file.c

+2 −2
Original line number Diff line number Diff line
@@ -3090,8 +3090,8 @@ static ssize_t ceph_copy_file_range(struct file *src_file, loff_t src_off, 
				     len, flags);



	if (ret == -EOPNOTSUPP || ret == -EXDEV)

		ret = generic_copy_file_range(src_file, src_off, dst_file,

					      dst_off, len, flags);

		ret = splice_copy_file_range(src_file, src_off, dst_file,

					     dst_off, len);

	return ret;

}

fs/fuse/file.c

+3 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/uio.h>

#include <linux/fs.h>

#include <linux/filelock.h>

#include <linux/splice.h>



static int fuse_send_open(struct fuse_mount *fm, u64 nodeid,

			  unsigned int open_flags, int opcode,
@@ -3193,8 +3194,8 @@ static ssize_t fuse_copy_file_range(struct file *src_file, loff_t src_off, 
				     len, flags);



	if (ret == -EOPNOTSUPP || ret == -EXDEV)

		ret = generic_copy_file_range(src_file, src_off, dst_file,

					      dst_off, len, flags);

		ret = splice_copy_file_range(src_file, src_off, dst_file,

					     dst_off, len);

	return ret;

}

fs/nfs/nfs4file.c

+3 −2
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/mount.h>

#include <linux/nfs_fs.h>

#include <linux/nfs_ssc.h>

#include <linux/splice.h>

#include "delegation.h"

#include "internal.h"

#include "iostat.h"
@@ -195,8 +196,8 @@ static ssize_t nfs4_copy_file_range(struct file *file_in, loff_t pos_in, 
	ret = __nfs4_copy_file_range(file_in, pos_in, file_out, pos_out, count,

				     flags);

	if (ret == -EOPNOTSUPP || ret == -EXDEV)

		ret = generic_copy_file_range(file_in, pos_in, file_out,

					      pos_out, count, flags);

		ret = splice_copy_file_range(file_in, pos_in, file_out,

					     pos_out, count);

	return ret;

}

fs/read_write.c

+0 −34
Original line number Diff line number Diff line
@@ -1396,40 +1396,6 @@ COMPAT_SYSCALL_DEFINE4(sendfile64, int, out_fd, int, in_fd, 
}

#endif



/**

 * generic_copy_file_range - copy data between two files

 * @file_in:	file structure to read from

 * @pos_in:	file offset to read from

 * @file_out:	file structure to write data to

 * @pos_out:	file offset to write data to

 * @len:	amount of data to copy

 * @flags:	copy flags

 *

 * This is a generic filesystem helper to copy data from one file to another.

 * It has no constraints on the source or destination file owners - the files

 * can belong to different superblocks and different filesystem types. Short

 * copies are allowed.

 *

 * This should be called from the @file_out filesystem, as per the

 * ->copy_file_range() method.

 *

 * Returns the number of bytes copied or a negative error indicating the

 * failure.

 */



ssize_t generic_copy_file_range(struct file *file_in, loff_t pos_in,

				struct file *file_out, loff_t pos_out,

				size_t len, unsigned int flags)

{

	/* May only be called from within ->copy_file_range() methods */

	if (WARN_ON_ONCE(flags))

		return -EINVAL;



	return splice_file_range(file_in, &pos_in, file_out, &pos_out,

				 min_t(size_t, len, MAX_RW_COUNT));

}

EXPORT_SYMBOL(generic_copy_file_range);



/*

 * Performs necessary checks before doing a file copy

 *

fs/smb/client/cifsfs.c

+3 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/freezer.h>

#include <linux/namei.h>

#include <linux/random.h>

#include <linux/splice.h>

#include <linux/uuid.h>

#include <linux/xattr.h>

#include <uapi/linux/magic.h>
@@ -1362,8 +1363,8 @@ static ssize_t cifs_copy_file_range(struct file *src_file, loff_t off, 
	free_xid(xid);



	if (rc == -EOPNOTSUPP || rc == -EXDEV)

		rc = generic_copy_file_range(src_file, off, dst_file,

					     destoff, len, flags);

		rc = splice_copy_file_range(src_file, off, dst_file,

					    destoff, len);

	return rc;

}