SUNRPC: New xdr_streams XDR decoder API

[mv-sheeva.git] / net / sunrpc / rpcb_clnt.c

diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
index 43838c72b7784168e5df73d8f2717865c7930e51..c652e4cc9fe97c987dbb9eb1eef3e1c639ed1af4 100644 (file)
--- a/net/sunrpc/rpcb_clnt.c
+++ b/net/sunrpc/rpcb_clnt.c
@@ -689,39 +689,33 @@ static void rpcb_getport_done(struct rpc_task *child, void *data)
  * XDR functions for rpcbind
  */
 
-static int rpcb_enc_mapping(struct rpc_rqst *req, __be32 *p,
-                           const struct rpcbind_args *rpcb)
+static void rpcb_enc_mapping(struct rpc_rqst *req, struct xdr_stream *xdr,
+                            const struct rpcbind_args *rpcb)
 {
        struct rpc_task *task = req->rq_task;
-       struct xdr_stream xdr;
+       __be32 *p;
 
        dprintk("RPC: %5u encoding PMAP_%s call (%u, %u, %d, %u)\n",
                        task->tk_pid, task->tk_msg.rpc_proc->p_name,
                        rpcb->r_prog, rpcb->r_vers, rpcb->r_prot, rpcb->r_port);
 
-       xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-
-       p = xdr_reserve_space(&xdr, RPCB_mappingargs_sz << 2);
+       p = xdr_reserve_space(xdr, RPCB_mappingargs_sz << 2);
        *p++ = cpu_to_be32(rpcb->r_prog);
        *p++ = cpu_to_be32(rpcb->r_vers);
        *p++ = cpu_to_be32(rpcb->r_prot);
        *p   = cpu_to_be32(rpcb->r_port);
-
-       return 0;
 }
 
-static int rpcb_dec_getport(struct rpc_rqst *req, __be32 *p,
+static int rpcb_dec_getport(struct rpc_rqst *req, struct xdr_stream *xdr,
                            struct rpcbind_args *rpcb)
 {
        struct rpc_task *task = req->rq_task;
-       struct xdr_stream xdr;
        unsigned long port;
-
-       xdr_init_decode(&xdr, &req->rq_rcv_buf, p);
+       __be32 *p;
 
        rpcb->r_port = 0;
 
-       p = xdr_inline_decode(&xdr, 4);
+       p = xdr_inline_decode(xdr, 4);
        if (unlikely(p == NULL))
                return -EIO;
 
@@ -735,20 +729,18 @@ static int rpcb_dec_getport(struct rpc_rqst *req, __be32 *p,
        return 0;
 }
 
-static int rpcb_dec_set(struct rpc_rqst *req, __be32 *p,
+static int rpcb_dec_set(struct rpc_rqst *req, struct xdr_stream *xdr,
                        unsigned int *boolp)
 {
        struct rpc_task *task = req->rq_task;
-       struct xdr_stream xdr;
-
-       xdr_init_decode(&xdr, &req->rq_rcv_buf, p);
+       __be32 *p;
 
-       p = xdr_inline_decode(&xdr, 4);
+       p = xdr_inline_decode(xdr, 4);
        if (unlikely(p == NULL))
                return -EIO;
 
        *boolp = 0;
-       if (*p)
+       if (*p != xdr_zero)
                *boolp = 1;
 
        dprintk("RPC: %5u RPCB_%s call %s\n",
@@ -769,43 +761,38 @@ static void encode_rpcb_string(struct xdr_stream *xdr, const char *string,
        xdr_encode_opaque(p, string, len);
 }
 
-static int rpcb_enc_getaddr(struct rpc_rqst *req, __be32 *p,
-                           const struct rpcbind_args *rpcb)
+static void rpcb_enc_getaddr(struct rpc_rqst *req, struct xdr_stream *xdr,
+                            const struct rpcbind_args *rpcb)
 {
        struct rpc_task *task = req->rq_task;
-       struct xdr_stream xdr;
+       __be32 *p;
 
        dprintk("RPC: %5u encoding RPCB_%s call (%u, %u, '%s', '%s')\n",
                        task->tk_pid, task->tk_msg.rpc_proc->p_name,
                        rpcb->r_prog, rpcb->r_vers,
                        rpcb->r_netid, rpcb->r_addr);
 
-       xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-
-       p = xdr_reserve_space(&xdr, (RPCB_program_sz + RPCB_version_sz) << 2);
+       p = xdr_reserve_space(xdr, (RPCB_program_sz + RPCB_version_sz) << 2);
        *p++ = cpu_to_be32(rpcb->r_prog);
        *p = cpu_to_be32(rpcb->r_vers);
 
-       encode_rpcb_string(&xdr, rpcb->r_netid, RPCBIND_MAXNETIDLEN);
-       encode_rpcb_string(&xdr, rpcb->r_addr, RPCBIND_MAXUADDRLEN);
-       encode_rpcb_string(&xdr, rpcb->r_owner, RPCB_MAXOWNERLEN);
-       return 0;
+       encode_rpcb_string(xdr, rpcb->r_netid, RPCBIND_MAXNETIDLEN);
+       encode_rpcb_string(xdr, rpcb->r_addr, RPCBIND_MAXUADDRLEN);
+       encode_rpcb_string(xdr, rpcb->r_owner, RPCB_MAXOWNERLEN);
 }
 
-static int rpcb_dec_getaddr(struct rpc_rqst *req, __be32 *p,
+static int rpcb_dec_getaddr(struct rpc_rqst *req, struct xdr_stream *xdr,
                            struct rpcbind_args *rpcb)
 {
        struct sockaddr_storage address;
        struct sockaddr *sap = (struct sockaddr *)&address;
        struct rpc_task *task = req->rq_task;
-       struct xdr_stream xdr;
+       __be32 *p;
        u32 len;
 
        rpcb->r_port = 0;
 
-       xdr_init_decode(&xdr, &req->rq_rcv_buf, p);
-
-       p = xdr_inline_decode(&xdr, 4);
+       p = xdr_inline_decode(xdr, 4);
        if (unlikely(p == NULL))
                goto out_fail;
        len = be32_to_cpup(p);
@@ -823,7 +810,7 @@ static int rpcb_dec_getaddr(struct rpc_rqst *req, __be32 *p,
        if (unlikely(len > RPCBIND_MAXUADDRLEN))
                goto out_fail;
 
-       p = xdr_inline_decode(&xdr, len);
+       p = xdr_inline_decode(xdr, len);
        if (unlikely(p == NULL))
                goto out_fail;
        dprintk("RPC: %5u RPCB_%s reply: %s\n", task->tk_pid,
@@ -849,8 +836,8 @@ out_fail:
 static struct rpc_procinfo rpcb_procedures2[] = {
        [RPCBPROC_SET] = {
                .p_proc         = RPCBPROC_SET,
-               .p_encode       = (kxdrproc_t)rpcb_enc_mapping,
-               .p_decode       = (kxdrproc_t)rpcb_dec_set,
+               .p_encode       = (kxdreproc_t)rpcb_enc_mapping,
+               .p_decode       = (kxdrdproc_t)rpcb_dec_set,
                .p_arglen       = RPCB_mappingargs_sz,
                .p_replen       = RPCB_setres_sz,
                .p_statidx      = RPCBPROC_SET,
@@ -859,8 +846,8 @@ static struct rpc_procinfo rpcb_procedures2[] = {
        },
        [RPCBPROC_UNSET] = {
                .p_proc         = RPCBPROC_UNSET,
-               .p_encode       = (kxdrproc_t)rpcb_enc_mapping,
-               .p_decode       = (kxdrproc_t)rpcb_dec_set,
+               .p_encode       = (kxdreproc_t)rpcb_enc_mapping,
+               .p_decode       = (kxdrdproc_t)rpcb_dec_set,
                .p_arglen       = RPCB_mappingargs_sz,
                .p_replen       = RPCB_setres_sz,
                .p_statidx      = RPCBPROC_UNSET,
@@ -869,8 +856,8 @@ static struct rpc_procinfo rpcb_procedures2[] = {
        },
        [RPCBPROC_GETPORT] = {
                .p_proc         = RPCBPROC_GETPORT,
-               .p_encode       = (kxdrproc_t)rpcb_enc_mapping,
-               .p_decode       = (kxdrproc_t)rpcb_dec_getport,
+               .p_encode       = (kxdreproc_t)rpcb_enc_mapping,
+               .p_decode       = (kxdrdproc_t)rpcb_dec_getport,
                .p_arglen       = RPCB_mappingargs_sz,
                .p_replen       = RPCB_getportres_sz,
                .p_statidx      = RPCBPROC_GETPORT,
@@ -882,8 +869,8 @@ static struct rpc_procinfo rpcb_procedures2[] = {
 static struct rpc_procinfo rpcb_procedures3[] = {
        [RPCBPROC_SET] = {
                .p_proc         = RPCBPROC_SET,
-               .p_encode       = (kxdrproc_t)rpcb_enc_getaddr,
-               .p_decode       = (kxdrproc_t)rpcb_dec_set,
+               .p_encode       = (kxdreproc_t)rpcb_enc_getaddr,
+               .p_decode       = (kxdrdproc_t)rpcb_dec_set,
                .p_arglen       = RPCB_getaddrargs_sz,
                .p_replen       = RPCB_setres_sz,
                .p_statidx      = RPCBPROC_SET,
@@ -892,8 +879,8 @@ static struct rpc_procinfo rpcb_procedures3[] = {
        },
        [RPCBPROC_UNSET] = {
                .p_proc         = RPCBPROC_UNSET,
-               .p_encode       = (kxdrproc_t)rpcb_enc_getaddr,
-               .p_decode       = (kxdrproc_t)rpcb_dec_set,
+               .p_encode       = (kxdreproc_t)rpcb_enc_getaddr,
+               .p_decode       = (kxdrdproc_t)rpcb_dec_set,
                .p_arglen       = RPCB_getaddrargs_sz,
                .p_replen       = RPCB_setres_sz,
                .p_statidx      = RPCBPROC_UNSET,
@@ -902,8 +889,8 @@ static struct rpc_procinfo rpcb_procedures3[] = {
        },
        [RPCBPROC_GETADDR] = {
                .p_proc         = RPCBPROC_GETADDR,
-               .p_encode       = (kxdrproc_t)rpcb_enc_getaddr,
-               .p_decode       = (kxdrproc_t)rpcb_dec_getaddr,
+               .p_encode       = (kxdreproc_t)rpcb_enc_getaddr,
+               .p_decode       = (kxdrdproc_t)rpcb_dec_getaddr,
                .p_arglen       = RPCB_getaddrargs_sz,
                .p_replen       = RPCB_getaddrres_sz,
                .p_statidx      = RPCBPROC_GETADDR,
@@ -915,8 +902,8 @@ static struct rpc_procinfo rpcb_procedures3[] = {
 static struct rpc_procinfo rpcb_procedures4[] = {
        [RPCBPROC_SET] = {
                .p_proc         = RPCBPROC_SET,
-               .p_encode       = (kxdrproc_t)rpcb_enc_getaddr,
-               .p_decode       = (kxdrproc_t)rpcb_dec_set,
+               .p_encode       = (kxdreproc_t)rpcb_enc_getaddr,
+               .p_decode       = (kxdrdproc_t)rpcb_dec_set,
                .p_arglen       = RPCB_getaddrargs_sz,
                .p_replen       = RPCB_setres_sz,
                .p_statidx      = RPCBPROC_SET,
@@ -925,8 +912,8 @@ static struct rpc_procinfo rpcb_procedures4[] = {
        },
        [RPCBPROC_UNSET] = {
                .p_proc         = RPCBPROC_UNSET,
-               .p_encode       = (kxdrproc_t)rpcb_enc_getaddr,
-               .p_decode       = (kxdrproc_t)rpcb_dec_set,
+               .p_encode       = (kxdreproc_t)rpcb_enc_getaddr,
+               .p_decode       = (kxdrdproc_t)rpcb_dec_set,
                .p_arglen       = RPCB_getaddrargs_sz,
                .p_replen       = RPCB_setres_sz,
                .p_statidx      = RPCBPROC_UNSET,
@@ -935,8 +922,8 @@ static struct rpc_procinfo rpcb_procedures4[] = {
        },
        [RPCBPROC_GETADDR] = {
                .p_proc         = RPCBPROC_GETADDR,
-               .p_encode       = (kxdrproc_t)rpcb_enc_getaddr,
-               .p_decode       = (kxdrproc_t)rpcb_dec_getaddr,
+               .p_encode       = (kxdreproc_t)rpcb_enc_getaddr,
+               .p_decode       = (kxdrdproc_t)rpcb_dec_getaddr,
                .p_arglen       = RPCB_getaddrargs_sz,
                .p_replen       = RPCB_getaddrres_sz,
                .p_statidx      = RPCBPROC_GETADDR,