From: Chuck Lever <chuck.lever@oracle.com>
Date: Thu, 3 Jun 2021 20:50:58 +0000 (-0400)
Subject: lockd: Update the NLMv1 void argument decoder to use struct xdr_stream
X-Git-Tag: accepted/tizen/unified/20230118.172025~6873^2~29
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cc1029b51273da5b342683e9ae14ab4eeaa15997;p=platform%2Fkernel%2Flinux-rpi.git

lockd: Update the NLMv1 void argument 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 982629f..8be42a2 100644
--- a/fs/lockd/xdr.c
+++ b/fs/lockd/xdr.c
@@ -19,6 +19,8 @@
 
 #include <uapi/linux/nfs2.h>
 
+#include "svcxdr.h"
+
 #define NLMDBG_FACILITY		NLMDBG_XDR
 
 
@@ -178,8 +180,15 @@ nlm_encode_testres(__be32 *p, struct nlm_res *resp)
 
 
 /*
- * First, the server side XDR functions
+ * Decode Call arguments
  */
+
+int
+nlmsvc_decode_void(struct svc_rqst *rqstp, __be32 *p)
+{
+	return 1;
+}
+
 int
 nlmsvc_decode_testargs(struct svc_rqst *rqstp, __be32 *p)
 {
@@ -340,12 +349,6 @@ nlmsvc_decode_res(struct svc_rqst *rqstp, __be32 *p)
 }
 
 int
-nlmsvc_decode_void(struct svc_rqst *rqstp, __be32 *p)
-{
-	return xdr_argsize_check(rqstp, p);
-}
-
-int
 nlmsvc_encode_void(struct svc_rqst *rqstp, __be32 *p)
 {
 	return xdr_ressize_check(rqstp, p);