summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2021-06-03 23:52:46 +0300
committerJ. Bruce Fields <bfields@redhat.com>2021-07-07 03:14:43 +0300
commitb4c24b5a41da63e5f3a9b6ea56cbe2a1efe49579 (patch)
tree2f9f773d7a3b72dae16e5574052600487573b3b1
parentd76d8c25cea794f65615f3a2324052afa4b5f900 (diff)
downloadlinux-b4c24b5a41da63e5f3a9b6ea56cbe2a1efe49579.tar.xz
lockd: Update the NLMv4 nlm_res 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>
-rw-r--r--fs/lockd/xdr4.c25
1 files changed, 14 insertions, 11 deletions
diff --git a/fs/lockd/xdr4.c b/fs/lockd/xdr4.c
index 47a87ea4a99b..6bd3bfb69ed7 100644
--- a/fs/lockd/xdr4.c
+++ b/fs/lockd/xdr4.c
@@ -296,6 +296,20 @@ nlm4svc_decode_unlockargs(struct svc_rqst *rqstp, __be32 *p)
}
int
+nlm4svc_decode_res(struct svc_rqst *rqstp, __be32 *p)
+{
+ struct xdr_stream *xdr = &rqstp->rq_arg_stream;
+ struct nlm_res *resp = rqstp->rq_argp;
+
+ if (!svcxdr_decode_cookie(xdr, &resp->cookie))
+ return 0;
+ if (!svcxdr_decode_stats(xdr, &resp->status))
+ return 0;
+
+ return 1;
+}
+
+int
nlm4svc_encode_testres(struct svc_rqst *rqstp, __be32 *p)
{
struct nlm_res *resp = rqstp->rq_resp;
@@ -376,17 +390,6 @@ nlm4svc_decode_reboot(struct svc_rqst *rqstp, __be32 *p)
}
int
-nlm4svc_decode_res(struct svc_rqst *rqstp, __be32 *p)
-{
- struct nlm_res *resp = rqstp->rq_argp;
-
- if (!(p = nlm4_decode_cookie(p, &resp->cookie)))
- return 0;
- resp->status = *p++;
- return xdr_argsize_check(rqstp, p);
-}
-
-int
nlm4svc_encode_void(struct svc_rqst *rqstp, __be32 *p)
{
return xdr_ressize_check(rqstp, p);