2 files changed, 4 insertions, 16 deletions

diff --git a/fs/nfs/nfs2xdr.c b/fs/nfs/nfs2xdr.c
index baf759bccd05..db81166182c9 100644
--- a/fs/nfs/nfs2xdr.c
+++ b/fs/nfs/nfs2xdr.c
@@ -978,16 +978,10 @@ static int decode_readdirok(struct xdr_stream *xdr)
         pglen = xdr->buf->page_len;
         hdrlen = (u8 *)xdr->p - (u8 *)xdr->iov->iov_base;
         recvd = xdr->buf->len - hdrlen;
-        if (unlikely(pglen > recvd))
-                goto out_cheating;
-out:
+        if (pglen > recvd)
+                pglen = recvd;
         xdr_read_pages(xdr, pglen);
         return pglen;
-out_cheating:
-        dprintk("NFS: server cheating in readdir result: "
-                "pglen %u > recvd %u\n", pglen, recvd);
-        pglen = recvd;
-        goto out;
 }
 
 static int nfs2_xdr_dec_readdirres(struct rpc_rqst *req,
diff --git a/fs/nfs/nfs3xdr.c b/fs/nfs/nfs3xdr.c
index 902de489ec9b..3c61c7f80a4b 100644
--- a/fs/nfs/nfs3xdr.c
+++ b/fs/nfs/nfs3xdr.c
@@ -2045,16 +2045,10 @@ static int decode_dirlist3(struct xdr_stream *xdr)
         pglen = xdr->buf->page_len;
         hdrlen = (u8 *)xdr->p - (u8 *)xdr->iov->iov_base;
         recvd = xdr->buf->len - hdrlen;
-        if (unlikely(pglen > recvd))
-                goto out_cheating;
-out:
+        if (pglen > recvd)
+                pglen = recvd;
         xdr_read_pages(xdr, pglen);
         return pglen;
-out_cheating:
-        dprintk("NFS: server cheating in readdir result: "
-                "pglen %u > recvd %u\n", pglen, recvd);
-        pglen = recvd;
-        goto out;
 }
 
 static int decode_readdir3resok(struct xdr_stream *xdr,