NFSD: Update the NFSv2 READ result encoder to use struct xdr_stream

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c
index f550804829972e52447fa7565fa022fd7acf8262..2088bb0887ba40079cb38180bca719dad5c36d59 100644 (file)
--- a/fs/nfsd/nfsproc.c
+++ b/fs/nfsd/nfsproc.c
@@ -185,6 +185,7 @@ nfsd_proc_read(struct svc_rqst *rqstp)
 
        v = 0;
        len = argp->count;
+       resp->pages = rqstp->rq_next_page;
        while (len > 0) {
                struct page *page = *(rqstp->rq_next_page++);
 

diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c
index 74d9d11949c6c99747936ae569fd2fdb00c5978a..d6d7d07dbb1b221bcc6ae9fb13c2becb03615062 100644 (file)
--- a/fs/nfsd/nfsxdr.c
+++ b/fs/nfsd/nfsxdr.c
@@ -549,27 +549,25 @@ nfssvc_encode_readlinkres(struct svc_rqst *rqstp, __be32 *p)
 int
 nfssvc_encode_readres(struct svc_rqst *rqstp, __be32 *p)
 {
+       struct xdr_stream *xdr = &rqstp->rq_res_stream;
        struct nfsd_readres *resp = rqstp->rq_resp;
        struct kvec *head = rqstp->rq_res.head;
 
-       *p++ = resp->status;
-       if (resp->status != nfs_ok)
-               return xdr_ressize_check(rqstp, p);
-
-       p = encode_fattr(rqstp, p, &resp->fh, &resp->stat);
-       *p++ = htonl(resp->count);
-       xdr_ressize_check(rqstp, p);
-
-       /* now update rqstp->rq_res to reflect data as well */
-       rqstp->rq_res.page_len = resp->count;
-       if (resp->count & 3) {
-               /* need to pad the tail */
-               rqstp->rq_res.tail[0].iov_base = p;
-               *p = 0;
-               rqstp->rq_res.tail[0].iov_len = 4 - (resp->count&3);
-       }
-       if (svc_encode_result_payload(rqstp, head->iov_len, resp->count))
+       if (!svcxdr_encode_stat(xdr, resp->status))
                return 0;
+       switch (resp->status) {
+       case nfs_ok:
+               if (!svcxdr_encode_fattr(rqstp, xdr, &resp->fh, &resp->stat))
+                       return 0;
+               if (xdr_stream_encode_u32(xdr, resp->count) < 0)
+                       return 0;
+               xdr_write_pages(xdr, resp->pages, rqstp->rq_res.page_base,
+                               resp->count);
+               if (svc_encode_result_payload(rqstp, head->iov_len, resp->count) < 0)
+                       return 0;
+               break;
+       }
+
        return 1;
 }
 

diff --git a/fs/nfsd/xdr.h b/fs/nfsd/xdr.h
index b868565c471fff4996a83380d9d602f9b8f852bb..277b74c511ce73c2a90520bc444fcbbda25cdec5 100644 (file)
--- a/fs/nfsd/xdr.h
+++ b/fs/nfsd/xdr.h
@@ -102,6 +102,7 @@ struct nfsd_readres {
        struct svc_fh           fh;
        unsigned long           count;
        struct kstat            stat;
+       struct page             **pages;
 };
 
 struct nfsd_readdirres {