OSDN Git Service

NFSv2: Fix eof handling
authorTrond Myklebust <trond.myklebust@hammerspace.com>
Tue, 27 Aug 2019 00:41:16 +0000 (20:41 -0400)
committerTrond Myklebust <trond.myklebust@hammerspace.com>
Tue, 27 Aug 2019 14:24:56 +0000 (10:24 -0400)
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>
fs/nfs/proc.c

index 5552fa8..ec79d22 100644 (file)
@@ -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;