diff options
| author | Amir Goldstein <amir73il@gmail.com> | 2023-12-12 11:44:37 +0200 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2023-12-12 16:20:02 +0100 |
| commit | 705bcfcbde38b9dd4db00cd3deb0b98bddb0dd4a (patch) | |
| tree | 77e4d1a15c6bc790be3f6d5b215a707d9b21d61b /fs/nfs | |
| parent | 0f292086c22b43202daffc14b585d3b54b9a1206 (diff) | |
| download | linux-stable-705bcfcbde38b9dd4db00cd3deb0b98bddb0dd4a.tar.gz linux-stable-705bcfcbde38b9dd4db00cd3deb0b98bddb0dd4a.tar.bz2 linux-stable-705bcfcbde38b9dd4db00cd3deb0b98bddb0dd4a.zip | |
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: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/linux-fsdevel/20231204083849.GC32438@lst.de/
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Link: https://lore.kernel.org/r/20231212094440.250945-3-amir73il@gmail.com
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/nfs4file.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c index 02788c3c85e5..e238abc78a13 100644 --- a/fs/nfs/nfs4file.c +++ b/fs/nfs/nfs4file.c @@ -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; } |