NFSD: Update the NFSv3 READLINK3res encoder 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 49b018a..e55a1d1 100644 (file)
--- a/fs/nfsd/nfs3proc.c
+++ b/fs/nfsd/nfs3proc.c
@@ -126,14 +126,15 @@ nfsd3_proc_readlink(struct svc_rqst *rqstp)
 {
        struct nfsd_fhandle *argp = rqstp->rq_argp;
        struct nfsd3_readlinkres *resp = rqstp->rq_resp;
-       char *buffer = page_address(*(rqstp->rq_next_page++));
 
        dprintk("nfsd: READLINK(3) %s\n", SVCFH_fmt(&argp->fh));
 
        /* Read the symlink. */
        fh_copy(&resp->fh, &argp->fh);
        resp->len = NFS3_MAXPATHLEN;
-       resp->status = nfsd_readlink(rqstp, &resp->fh, buffer, &resp->len);
+       resp->pages = rqstp->rq_next_page++;
+       resp->status = nfsd_readlink(rqstp, &resp->fh,
+                                    page_address(*resp->pages), &resp->len);
        return rpc_success;
 }
 

diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c
index 29b923a..352691c 100644 (file)
--- a/fs/nfsd/nfs3xdr.c
+++ b/fs/nfsd/nfs3xdr.c
@@ -977,26 +977,28 @@ nfs3svc_encode_accessres(struct svc_rqst *rqstp, __be32 *p)
 int
 nfs3svc_encode_readlinkres(struct svc_rqst *rqstp, __be32 *p)
 {
+       struct xdr_stream *xdr = &rqstp->rq_res_stream;
        struct nfsd3_readlinkres *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->len);
-               xdr_ressize_check(rqstp, p);
-               rqstp->rq_res.page_len = resp->len;
-               if (resp->len & 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->len&3);
-               }
-               if (svc_encode_result_payload(rqstp, head->iov_len, resp->len))
+       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->len) < 0)
+                       return 0;
+               xdr_write_pages(xdr, resp->pages, 0, resp->len);
+               if (svc_encode_result_payload(rqstp, head->iov_len, resp->len) < 0)
+                       return 0;
+               break;
+       default:
+               if (!svcxdr_encode_post_op_attr(rqstp, xdr, &resp->fh))
+                       return 0;
+       }
+
+       return 1;
 }
 
 /* READ */

diff --git a/fs/nfsd/xdr3.h b/fs/nfsd/xdr3.h
index 7db4ee1..1d633c5 100644 (file)
--- a/fs/nfsd/xdr3.h
+++ b/fs/nfsd/xdr3.h
@@ -137,6 +137,7 @@ struct nfsd3_readlinkres {
        __be32                  status;
        struct svc_fh           fh;
        __u32                   len;
+       struct page             **pages;
 };
 
 struct nfsd3_readres {