NFSv4.2: Handle hole lengths that exceed the READ_PLUS read buffer

If a hole extends beyond the READ_PLUS read buffer, then we want to fill
just the remaining buffer with zeros. Also ignore eof...

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

diff --git a/fs/nfs/nfs42xdr.c b/fs/nfs/nfs42xdr.c
index f9faa131a4f5049361eb203b31883776fbbe6f07..6ba2a28e7e03f4326196e9b24bf87bb2e61d16d8 100644 (file)
--- a/fs/nfs/nfs42xdr.c
+++ b/fs/nfs/nfs42xdr.c
@@ -1080,6 +1080,12 @@ static int decode_read_plus_hole(struct xdr_stream *xdr,
                }
                length -= args->offset + res->count - offset;
        }
+       if (length + res->count > args->count) {
+               *eof = 0;
+               if (unlikely(res->count >= args->count))
+                       return 1;
+               length = args->count - res->count;
+       }
        recvd = xdr_expand_hole(xdr, res->count, length);
        res->count += recvd;