diff options
| author | Trond Myklebust <trond.myklebust@hammerspace.com> | 2019-08-26 20:41:16 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-09-21 07:18:36 +0200 |
| commit | 646d295fdded37e69b81652a8c89e9d9c0c58f93 (patch) | |
| tree | 3c35d898e81c95a4ad5ddeb1026db67ded3807e4 /fs/nfs | |
| parent | 16986c7cf8b5fc2ca5bcf6b3dc84c4e3dac504e1 (diff) | |
| download | linux-stable-646d295fdded37e69b81652a8c89e9d9c0c58f93.tar.gz linux-stable-646d295fdded37e69b81652a8c89e9d9c0c58f93.tar.bz2 linux-stable-646d295fdded37e69b81652a8c89e9d9c0c58f93.zip | |
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 5552fa8b6e12..ec79d2214a78 100644 --- a/fs/nfs/proc.c +++ b/fs/nfs/proc.c @@ -594,7 +594,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; |