diff options
| author | Amir Goldstein <amir73il@gmail.com> | 2023-12-12 12:44:37 +0300 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2023-12-12 18:20:02 +0300 |
| commit | 705bcfcbde38b9dd4db00cd3deb0b98bddb0dd4a (patch) | |
| tree | 77e4d1a15c6bc790be3f6d5b215a707d9b21d61b /fs/smb | |
| parent | 0f292086c22b43202daffc14b585d3b54b9a1206 (diff) | |
| download | linux-705bcfcbde38b9dd4db00cd3deb0b98bddb0dd4a.tar.xz | |
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/smb')
| -rw-r--r-- | fs/smb/client/cifsfs.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/smb/client/cifsfs.c b/fs/smb/client/cifsfs.c index ea3a7a668b45..ee461bf0ef63 100644 --- a/fs/smb/client/cifsfs.c +++ b/fs/smb/client/cifsfs.c @@ -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; } |