summaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2020-10-20 14:41:56 -0400
committerChuck Lever <chuck.lever@oracle.com>2021-01-25 09:36:24 -0500
commitc8d26a0acfe77f0880e0acfe77e4209cf8f3a38b (patch)
tree607c03f9829d6304472cd7708909d7b2548b7e1e /fs/nfsd
parent9cedc2e64c296efb3bebe93a0ceeb5e71e8d722d (diff)
downloadlinux-c8d26a0acfe77f0880e0acfe77e4209cf8f3a38b.tar.gz
linux-c8d26a0acfe77f0880e0acfe77e4209cf8f3a38b.tar.bz2
linux-c8d26a0acfe77f0880e0acfe77e4209cf8f3a38b.zip
NFSD: Update COMMIT3arg decoder to use struct xdr_stream
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/nfs3xdr.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c
index eb55be106a04..bafb84c97861 100644
--- a/fs/nfsd/nfs3xdr.c
+++ b/fs/nfsd/nfs3xdr.c
@@ -601,14 +601,17 @@ nfs3svc_decode_readdirplusargs(struct svc_rqst *rqstp, __be32 *p)
int
nfs3svc_decode_commitargs(struct svc_rqst *rqstp, __be32 *p)
{
+ struct xdr_stream *xdr = &rqstp->rq_arg_stream;
struct nfsd3_commitargs *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_u64(xdr, &args->offset) < 0)
+ return 0;
+ if (xdr_stream_decode_u32(xdr, &args->count) < 0)
return 0;
- p = xdr_decode_hyper(p, &args->offset);
- args->count = ntohl(*p++);
- return xdr_argsize_check(rqstp, p);
+ return 1;
}
/*