diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2022-11-27 12:40:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2022-11-27 12:40:06 -0800 |
| commit | cf562a45a0d57fb0333363c9d4ff82d061898355 (patch) | |
| tree | 434d9c5d431ca06b96410e850cc9b3f77856067b /fs/nfsd | |
| parent | Merge tag 'usb-6.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/greg... (diff) | |
| parent | vfs: fix copy_file_range() averts filesystem freeze protection (diff) | |
| download | linux-cf562a45a0d57fb0333363c9d4ff82d061898355.tar.gz linux-cf562a45a0d57fb0333363c9d4ff82d061898355.tar.bz2 linux-cf562a45a0d57fb0333363c9d4ff82d061898355.zip | |
Merge tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fix from Al Viro:
"Amir's copy_file_range() fix"
* tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
vfs: fix copy_file_range() averts filesystem freeze protection
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/vfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index ac3c3844cfc6..849a720ab43f 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -596,8 +596,8 @@ ssize_t nfsd_copy_file_range(struct file *src, u64 src_pos, struct file *dst, ret = vfs_copy_file_range(src, src_pos, dst, dst_pos, count, 0); if (ret == -EOPNOTSUPP || ret == -EXDEV) - ret = generic_copy_file_range(src, src_pos, dst, dst_pos, - count, 0); + ret = vfs_copy_file_range(src, src_pos, dst, dst_pos, count, + COPY_FILE_SPLICE); return ret; } |