diff options
| author | Trond Myklebust <trondmy@gmail.com> | 2019-08-26 13:03:11 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2019-09-23 16:24:08 -0400 |
| commit | 83a63072c815e8a042c60fa964dcbde2a6df0e87 (patch) | |
| tree | 2c768fecd75e144e5faf38951c96dd73d91e181e /fs/nfsd/nfs3proc.c | |
| parent | 65643f4c8217edb1f40f7fb05f996c3a4798442a (diff) | |
| download | linux-83a63072c815e8a042c60fa964dcbde2a6df0e87.tar.bz2 | |
nfsd: fix nfs read eof detection
Currently, the knfsd server assumes that a short read indicates an
end of file. That assumption is incorrect. The short read means that
either we've hit the end of file, or we've hit a read error.
In the case of a read error, the client may want to retry (as per the
implementation recommendations in RFC1813 and RFC7530), but currently it
is being told that it hit an eof.
Move the code to detect eof from version specific code into the generic
nfsd read.
Report eof only in the two following cases:
1) read() returns a zero length short read with no error.
2) the offset+length of the read is >= the file size.
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs3proc.c')
| -rw-r--r-- | fs/nfsd/nfs3proc.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c index 9bc32af4e2da..cea68d8411ac 100644 --- a/fs/nfsd/nfs3proc.c +++ b/fs/nfsd/nfs3proc.c @@ -172,13 +172,8 @@ nfsd3_proc_read(struct svc_rqst *rqstp) nfserr = nfsd_read(rqstp, &resp->fh, argp->offset, rqstp->rq_vec, argp->vlen, - &resp->count); - if (nfserr == 0) { - struct inode *inode = d_inode(resp->fh.fh_dentry); - resp->eof = nfsd_eof_on_read(cnt, resp->count, argp->offset, - inode->i_size); - } - + &resp->count, + &resp->eof); RETURN_STATUS(nfserr); } |