NFSD: Update the NFSv3 READ3res encode to use struct xdr_stream

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

diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c
index e55a1d14ede2082ad852162176118733bab9e64a..93d196752f87c946199011022bec2eb67f064bb5 100644 (file)
--- a/fs/nfsd/nfs3proc.c
+++ b/fs/nfsd/nfs3proc.c
@@ -159,6 +159,7 @@ nfsd3_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/nfs3xdr.c b/fs/nfsd/nfs3xdr.c
index 352691c3e246a536b834cdaea0a08b36efc0f3bc..859cc6c51c1a521cd12d4c8ca20b10ef07f4f3ad 100644 (file)
--- a/fs/nfsd/nfs3xdr.c
+++ b/fs/nfsd/nfs3xdr.c
@@ -1005,30 +1005,33 @@ nfs3svc_encode_readlinkres(struct svc_rqst *rqstp, __be32 *p)
 int
 nfs3svc_encode_readres(struct svc_rqst *rqstp, __be32 *p)
 {
+       struct xdr_stream *xdr = &rqstp->rq_res_stream;
        struct nfsd3_readres *resp = rqstp->rq_resp;
        struct kvec *head = rqstp->rq_res.head;
 
-       *p++ = resp->status;
-       p = encode_post_op_attr(rqstp, p, &resp->fh);
-       if (resp->status == 0) {
-               *p++ = htonl(resp->count);
-               *p++ = htonl(resp->eof);
-               *p++ = htonl(resp->count);      /* xdr opaque 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_nfsstat3(xdr, resp->status))
+               return 0;
+       switch (resp->status) {
+       case nfs_ok:
+               if (!svcxdr_encode_post_op_attr(rqstp, xdr, &resp->fh))
                        return 0;
-               return 1;
-       } else
-               return xdr_ressize_check(rqstp, p);
+               if (xdr_stream_encode_u32(xdr, resp->count) < 0)
+                       return 0;
+               if (xdr_stream_encode_bool(xdr, resp->eof) < 0)
+                       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;
+       default:
+               if (!svcxdr_encode_post_op_attr(rqstp, xdr, &resp->fh))
+                       return 0;
+       }
+
+       return 1;
 }
 
 /* WRITE */

diff --git a/fs/nfsd/xdr3.h b/fs/nfsd/xdr3.h
index 1d633c5d5fa286e56f373c0ed5e9d5ed121d084f..8073350418ae04bdf7268f483cdb1b95650383e7 100644 (file)
--- a/fs/nfsd/xdr3.h
+++ b/fs/nfsd/xdr3.h
@@ -145,6 +145,7 @@ struct nfsd3_readres {
        struct svc_fh           fh;
        unsigned long           count;
        __u32                   eof;
+       struct page             **pages;
 };
 
 struct nfsd3_writeres {

diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
index 2bc75c167f00f66d4269a3232cddfdbe650e5cdc..9dda7171b7b49df6659f23abf429e461af0a1a2e 100644 (file)
--- a/include/linux/sunrpc/xdr.h
+++ b/include/linux/sunrpc/xdr.h
@@ -394,6 +394,26 @@ static inline int xdr_stream_encode_item_absent(struct xdr_stream *xdr)
        return len;
 }
 
+/**
+ * xdr_stream_encode_bool - Encode a "not present" list item
+ * @xdr: pointer to xdr_stream
+ * @n: boolean value to encode
+ *
+ * Return values:
+ *   On success, returns length in bytes of XDR buffer consumed
+ *   %-EMSGSIZE on XDR buffer overflow
+ */
+static inline int xdr_stream_encode_bool(struct xdr_stream *xdr, __u32 n)
+{
+       const size_t len = XDR_UNIT;
+       __be32 *p = xdr_reserve_space(xdr, len);
+
+       if (unlikely(!p))
+               return -EMSGSIZE;
+       *p = n ? xdr_one : xdr_zero;
+       return len;
+}
+
 /**
  * xdr_stream_encode_u32 - Encode a 32-bit integer
  * @xdr: pointer to xdr_stream