As an additional clean up, move code not related to XDR decoding
into readdir's .pc_func call out.
Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
---
fs/nfsd/nfsxdr.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c
index 2664101aa1dc..6f4115303f58 100644
--- a/fs/nfsd/nfsxdr.c
+++ b/fs/nfsd/nfsxdr.c
@@ -375,15 +375,18 @@ nfssvc_decode_symlinkargs(struct svc_rqst *rqstp, __be32 *p)
int
nfssvc_decode_readdirargs(struct svc_rqst *rqstp, __be32 *p)
{
+ struct xdr_stream *xdr = &rqstp->rq_xdr_stream;
struct nfsd_readdirargs *args = rqstp->rq_argp;
- p = decode_fh(p, &args->fh);
+ if (!svcxdr_decode_fhandle(xdr, &args->fh))
+ return XDR_DECODE_FAILED;
+ p = xdr_inline_decode(xdr, sizeof(__be32) * 2);
if (!p)
- return 0;
- args->cookie = ntohl(*p++);
- args->count = ntohl(*p++);
+ return XDR_DECODE_FAILED;
+ args->cookie = be32_to_cpup(p++);
+ args->count = be32_to_cpup(p);
- return xdr_argsize_check(rqstp, p);
+ return XDR_DECODE_DONE;
}
/*
