From: Chuck Lever <chuck.lever@oracle.com>
Date: Tue, 17 Nov 2020 16:49:29 +0000 (-0500)
Subject: NFSD: Update the NFSv2 ACL ACCESS argument decoder to use struct xdr_stream
X-Git-Tag: v5.15~1764^2~27
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=64063892efc1daa3a48882673811ff327ba75ed5;p=platform%2Fkernel%2Flinux-starfive.git

NFSD: Update the NFSv2 ACL ACCESS argument decoder to use struct xdr_stream

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---

diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c
index 0274348..7eeac5b 100644
--- a/fs/nfsd/nfs2acl.c
+++ b/fs/nfsd/nfs2acl.c
@@ -222,14 +222,15 @@ static int nfsaclsvc_decode_setaclargs(struct svc_rqst *rqstp, __be32 *p)
 
 static int nfsaclsvc_decode_accessargs(struct svc_rqst *rqstp, __be32 *p)
 {
-	struct nfsd3_accessargs *argp = rqstp->rq_argp;
+	struct xdr_stream *xdr = &rqstp->rq_arg_stream;
+	struct nfsd3_accessargs *args = rqstp->rq_argp;
 
-	p = nfs2svc_decode_fh(p, &argp->fh);
-	if (!p)
+	if (!svcxdr_decode_fhandle(xdr, &args->fh))
+		return 0;
+	if (xdr_stream_decode_u32(xdr, &args->access) < 0)
 		return 0;
-	argp->access = ntohl(*p++);
 
-	return xdr_argsize_check(rqstp, p);
+	return 1;
 }
 
 /*