lockd: Update the NLMv1 FREE_ALL 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 c496f18eff06e04adfe489d83881bfc9cdfdeccc..091c8c463ab4015019237cb811e7f4b77e64980a 100644 (file)
--- a/fs/lockd/xdr.c
+++ b/fs/lockd/xdr.c
@@ -316,6 +316,21 @@ nlmsvc_decode_shareargs(struct svc_rqst *rqstp, __be32 *p)
        return 1;
 }
 
+int
+nlmsvc_decode_notify(struct svc_rqst *rqstp, __be32 *p)
+{
+       struct xdr_stream *xdr = &rqstp->rq_arg_stream;
+       struct nlm_args *argp = rqstp->rq_argp;
+       struct nlm_lock *lock = &argp->lock;
+
+       if (!svcxdr_decode_string(xdr, &lock->caller, &lock->len))
+               return 0;
+       if (xdr_stream_decode_u32(xdr, &argp->state) < 0)
+               return 0;
+
+       return 1;
+}
+
 int
 nlmsvc_encode_testres(struct svc_rqst *rqstp, __be32 *p)
 {
@@ -349,19 +364,6 @@ nlmsvc_encode_res(struct svc_rqst *rqstp, __be32 *p)
        return xdr_ressize_check(rqstp, p);
 }
 
-int
-nlmsvc_decode_notify(struct svc_rqst *rqstp, __be32 *p)
-{
-       struct nlm_args *argp = rqstp->rq_argp;
-       struct nlm_lock *lock = &argp->lock;
-
-       if (!(p = xdr_decode_string_inplace(p, &lock->caller,
-                                           &lock->len, NLM_MAXSTRLEN)))
-               return 0;
-       argp->state = ntohl(*p++);
-       return xdr_argsize_check(rqstp, p);
-}
-
 int
 nlmsvc_encode_void(struct svc_rqst *rqstp, __be32 *p)
 {