Skip to content

Commit 7956521

Browse files
chuckleverJ. Bruce Fields
authored andcommitted
lockd: Update the NLMv4 void arguments decoder to use struct xdr_stream
Signed-off-by: Chuck Lever <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]>
1 parent 529ca3a commit 7956521

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

fs/lockd/xdr4.c

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
#include <linux/sunrpc/stats.h>
1919
#include <linux/lockd/lockd.h>
2020

21+
#include "svcxdr.h"
22+
2123
#define NLMDBG_FACILITY NLMDBG_XDR
2224

2325
static inline loff_t
@@ -175,8 +177,15 @@ nlm4_encode_testres(__be32 *p, struct nlm_res *resp)
175177

176178

177179
/*
178-
* First, the server side XDR functions
180+
* Decode Call arguments
179181
*/
182+
183+
int
184+
nlm4svc_decode_void(struct svc_rqst *rqstp, __be32 *p)
185+
{
186+
return 1;
187+
}
188+
180189
int
181190
nlm4svc_decode_testargs(struct svc_rqst *rqstp, __be32 *p)
182191
{
@@ -336,12 +345,6 @@ nlm4svc_decode_res(struct svc_rqst *rqstp, __be32 *p)
336345
return xdr_argsize_check(rqstp, p);
337346
}
338347

339-
int
340-
nlm4svc_decode_void(struct svc_rqst *rqstp, __be32 *p)
341-
{
342-
return xdr_argsize_check(rqstp, p);
343-
}
344-
345348
int
346349
nlm4svc_encode_void(struct svc_rqst *rqstp, __be32 *p)
347350
{

0 commit comments

Comments
 (0)