lockd: Update the NLMv1 SM_NOTIFY arguments decoder 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 911b6377a6da4386d19a285d2c15c46f810476a5..421613170e5f9b3839f0533fe6f18ea67bb4362a 100644 (file)
--- a/fs/lockd/xdr.c
+++ b/fs/lockd/xdr.c
@@ -313,6 +313,32 @@ nlmsvc_decode_res(struct svc_rqst *rqstp, __be32 *p)
        return 1;
 }
 
+int
+nlmsvc_decode_reboot(struct svc_rqst *rqstp, __be32 *p)
+{
+       struct xdr_stream *xdr = &rqstp->rq_arg_stream;
+       struct nlm_reboot *argp = rqstp->rq_argp;
+       u32 len;
+
+       if (xdr_stream_decode_u32(xdr, &len) < 0)
+               return 0;
+       if (len > SM_MAXSTRLEN)
+               return 0;
+       p = xdr_inline_decode(xdr, len);
+       if (!p)
+               return 0;
+       argp->len = len;
+       argp->mon = (char *)p;
+       if (xdr_stream_decode_u32(xdr, &argp->state) < 0)
+               return 0;
+       p = xdr_inline_decode(xdr, SM_PRIV_SIZE);
+       if (!p)
+               return 0;
+       memcpy(&argp->priv.data, p, sizeof(argp->priv.data));
+
+       return 1;
+}
+
 int
 nlmsvc_encode_testres(struct svc_rqst *rqstp, __be32 *p)
 {
@@ -380,19 +406,6 @@ nlmsvc_decode_notify(struct svc_rqst *rqstp, __be32 *p)
        return xdr_argsize_check(rqstp, p);
 }
 
-int
-nlmsvc_decode_reboot(struct svc_rqst *rqstp, __be32 *p)
-{
-       struct nlm_reboot *argp = rqstp->rq_argp;
-
-       if (!(p = xdr_decode_string_inplace(p, &argp->mon, &argp->len, SM_MAXSTRLEN)))
-               return 0;
-       argp->state = ntohl(*p++);
-       memcpy(&argp->priv.data, p, sizeof(argp->priv.data));
-       p += XDR_QUADLEN(SM_PRIV_SIZE);
-       return xdr_argsize_check(rqstp, p);
-}
-
 int
 nlmsvc_encode_void(struct svc_rqst *rqstp, __be32 *p)
 {