diff options
| author | Trond Myklebust <trond.myklebust@hammerspace.com> | 2019-08-27 03:41:16 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-09-21 08:12:51 +0300 |
| commit | ccc4f53a7d4576d25e96dfaa9b9a902f0755d08c (patch) | |
| tree | 2b5a12dcd2e1cfa797c52df7aaa9a1e7e9688751 /fs/nfs | |
| parent | 1ad4aaa984dc234b5b0c0f816e09cc40b4632409 (diff) | |
| download | linux-ccc4f53a7d4576d25e96dfaa9b9a902f0755d08c.tar.xz | |
NFSv2: Fix eof handling
[ Upstream commit 71affe9be45a5c60b9772e1b2701710712637274 ]
If we received a reply from the server with a zero length read and
no error, then that implies we are at eof.
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/proc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c index b417bbcd9704..80ecdf2ec8b6 100644 --- a/fs/nfs/proc.c +++ b/fs/nfs/proc.c @@ -588,7 +588,8 @@ static int nfs_read_done(struct rpc_task *task, struct nfs_pgio_header *hdr) /* Emulate the eof flag, which isn't normally needed in NFSv2 * as it is guaranteed to always return the file attributes */ - if (hdr->args.offset + hdr->res.count >= hdr->res.fattr->size) + if ((hdr->res.count == 0 && hdr->args.count > 0) || + hdr->args.offset + hdr->res.count >= hdr->res.fattr->size) hdr->res.eof = 1; } return 0; |