2 files changed, 15 insertions, 2 deletions

diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c
index 9eb8086ea841..c9cf46e0c040 100644
--- a/fs/nfsd/nfs3proc.c
+++ b/fs/nfsd/nfs3proc.c
@@ -463,8 +463,19 @@ nfsd3_proc_readdir(struct svc_rqst *rqstp)
                                         &resp->common, nfs3svc_encode_entry);
         memcpy(resp->verf, argp->verf, 8);
         resp->count = resp->buffer - argp->buffer;
-        if (resp->offset)
-                xdr_encode_hyper(resp->offset, argp->cookie);
+        if (resp->offset) {
+                loff_t offset = argp->cookie;
+
+                if (unlikely(resp->offset1)) {
+                        /* we ended up with offset on a page boundary */
+                        *resp->offset = htonl(offset >> 32);
+                        *resp->offset1 = htonl(offset & 0xffffffff);
+                        resp->offset1 = NULL;
+                } else {
+                        xdr_encode_hyper(resp->offset, offset);
+                }
+                resp->offset = NULL;
+        }
 
         RETURN_STATUS(nfserr);
 }
@@ -533,6 +544,7 @@ nfsd3_proc_readdirplus(struct svc_rqst *rqstp)
                 } else {
                         xdr_encode_hyper(resp->offset, offset);
                 }
+                resp->offset = NULL;
         }
 
         RETURN_STATUS(nfserr);
diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c
index 9b973f4f7d01..83919116d5cb 100644
--- a/fs/nfsd/nfs3xdr.c
+++ b/fs/nfsd/nfs3xdr.c
@@ -921,6 +921,7 @@ encode_entry(struct readdir_cd *ccd, const char *name, int namlen,
                 } else {
                         xdr_encode_hyper(cd->offset, offset64);
                 }
+                cd->offset = NULL;
         }
 
         /*