lockd: Update the NLMv1 SHARE results encoder to use struct xdr_stream

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

diff --git a/fs/lockd/xdr.c b/fs/lockd/xdr.c
index 4fb6090bc915828e8b992a37582d30507c8e78cb..9235e60b17694bf031dbdfaf1d15cd54a1bc5ab4 100644 (file)
--- a/fs/lockd/xdr.c
+++ b/fs/lockd/xdr.c
@@ -41,18 +41,6 @@ loff_t_to_s32(loff_t offset)
        return res;
 }
 
-/*
- * XDR functions for basic NLM types
- */
-static inline __be32 *
-nlm_encode_cookie(__be32 *p, struct nlm_cookie *c)
-{
-       *p++ = htonl(c->len);
-       memcpy(p, c->data, c->len);
-       p+=XDR_QUADLEN(c->len);
-       return p;
-}
-
 /*
  * NLM file handles are defined by specification to be a variable-length
  * XDR opaque no longer than 1024 bytes. However, this implementation
@@ -361,11 +349,16 @@ nlmsvc_encode_res(struct svc_rqst *rqstp, __be32 *p)
 int
 nlmsvc_encode_shareres(struct svc_rqst *rqstp, __be32 *p)
 {
+       struct xdr_stream *xdr = &rqstp->rq_res_stream;
        struct nlm_res *resp = rqstp->rq_resp;
 
-       if (!(p = nlm_encode_cookie(p, &resp->cookie)))
+       if (!svcxdr_encode_cookie(xdr, &resp->cookie))
                return 0;
-       *p++ = resp->status;
-       *p++ = xdr_zero;                /* sequence argument */
-       return xdr_ressize_check(rqstp, p);
+       if (!svcxdr_encode_stats(xdr, resp->status))
+               return 0;
+       /* sequence */
+       if (xdr_stream_encode_u32(xdr, 0) < 0)
+               return 0;
+
+       return 1;
 }