github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 18:13:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ksmbd: copy overlapped range within the same file

Browse Source 
cifs.ko request to copy overlapped range within the same file.
ksmbd is using vfs_copy_file_range for this, vfs_copy_file_range() does not
allow overlapped copying within the same file.
This patch use do_splice_direct() if offset and length are overlapped.

Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
This commit is contained in:
Namjae Jeon 2025-09-25 21:15:20 +09:00 committed by Steve French
parent 3677ca67b9
commit c20988c217
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/smb/server/vfs.c
View File

@ -20,6 +20,7 @@
#include <linux/sched/xacct.h>
#include <linux/crc32c.h>
#include <linux/namei.h>
#include <linux/splice.h>
#include "glob.h"
#include "oplock.h"
@ -1829,8 +1830,19 @@ int ksmbd_vfs_copy_file_ranges(struct ksmbd_work *work,
if (src_off + len > src_file_size)
return -E2BIG;
ret = vfs_copy_file_range(src_fp->filp, src_off,
dst_fp->filp, dst_off, len, 0);
/*
* vfs_copy_file_range does not allow overlapped copying
* within the same file.
*/
if (file_inode(src_fp->filp) == file_inode(dst_fp->filp) &&
dst_off + len > src_off &&
dst_off < src_off + len)
ret = do_splice_direct(src_fp->filp, &src_off,
dst_fp->filp, &dst_off,
min_t(size_t, len, MAX_RW_COUNT), 0);
else
ret = vfs_copy_file_range(src_fp->filp, src_off,
dst_fp->filp, dst_off, len, 0);
if (ret == -EOPNOTSUPP || ret == -EXDEV)
ret = vfs_copy_file_range(src_fp->filp, src_off,
dst_fp->filp, dst_off, len,