diff options
| author | Trond Myklebust <trondmy@gmail.com> | 2019-01-21 21:58:38 +0100 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2019-02-06 21:32:05 +0100 |
| commit | e3fdc89ca47ef34dfb6fd5101fec084c3dba5486 (patch) | |
| tree | db76a23fac56a48431a2eb87a22f27ffd443b7ab /fs/nfsd | |
| parent | Linux 5.0-rc5 (diff) | |
| download | linux-e3fdc89ca47ef34dfb6fd5101fec084c3dba5486.tar.xz linux-e3fdc89ca47ef34dfb6fd5101fec084c3dba5486.zip | |
nfsd: Fix error return values for nfsd4_clone_file_range()
If the parameter 'count' is non-zero, nfsd4_clone_file_range() will
currently clobber all errors returned by vfs_clone_file_range() and
replace them with EINVAL.
Fixes: 42ec3d4c0218 ("vfs: make remap_file_range functions take and...")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Cc: stable@vger.kernel.org # v4.20+
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/vfs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 9824e32b2f23..7dc98e14655d 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -557,9 +557,11 @@ __be32 nfsd4_clone_file_range(struct file *src, u64 src_pos, struct file *dst, loff_t cloned; cloned = vfs_clone_file_range(src, src_pos, dst, dst_pos, count, 0); + if (cloned < 0) + return nfserrno(cloned); if (count && cloned != count) - cloned = -EINVAL; - return nfserrno(cloned < 0 ? cloned : 0); + return nfserrno(-EINVAL); + return 0; } ssize_t nfsd_copy_file_range(struct file *src, u64 src_pos, struct file *dst, |