NFSD: Update ACCESS3arg decoder to use struct xdr_stream

[ Upstream commit 3b921a2b14251e9e203f1e8af76e8ade79f50e50 ]

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c
index 3a2b4abea1a42d896d62dd8d89794ebc391c4cb1..e07cebd80ef7fe64bc64806875e474ed93864c45 100644 (file)
--- a/fs/nfsd/nfs3xdr.c
+++ b/fs/nfsd/nfs3xdr.c
@@ -375,14 +375,15 @@ nfs3svc_decode_diropargs(struct svc_rqst *rqstp, __be32 *p)
 int
 nfs3svc_decode_accessargs(struct svc_rqst *rqstp, __be32 *p)
 {
+       struct xdr_stream *xdr = &rqstp->rq_arg_stream;
        struct nfsd3_accessargs *args = rqstp->rq_argp;
 
-       p = decode_fh(p, &args->fh);
-       if (!p)
+       if (!svcxdr_decode_nfs_fh3(xdr, &args->fh))
+               return 0;
+       if (xdr_stream_decode_u32(xdr, &args->access) < 0)
                return 0;
-       args->access = ntohl(*p++);
 
-       return xdr_argsize_check(rqstp, p);
+       return 1;
 }
 
 int

diff --git a/fs/nfsd/xdr3.h b/fs/nfsd/xdr3.h
index 62ea669768cf319546348e65253ddf203e039dd6..a4dce4baec7c35171e3e508a155296e7033875a0 100644 (file)
--- a/fs/nfsd/xdr3.h
+++ b/fs/nfsd/xdr3.h
@@ -25,7 +25,7 @@ struct nfsd3_diropargs {
 
 struct nfsd3_accessargs {
        struct svc_fh           fh;
-       unsigned int            access;
+       __u32                   access;
 };
 
 struct nfsd3_readargs {