[v2,107/118] NFSD: Update the NFSv2 CREATE argument decoder to use struct xdr_stream

Commit Message

Chuck Lever Nov. 20, 2020, 8:43 p.m. UTC

Signed-off-by: Chuck Lever <[e-mail]>
---
 fs/nfsd/nfsxdr.c |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

Patch

diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c
index c34446c650ca..f02fef8a805e 100644
--- a/fs/nfsd/nfsxdr.c
+++ b/fs/nfsd/nfsxdr.c
@@ -397,14 +397,12 @@  nfssvc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p)
 int
 nfssvc_decode_createargs(struct svc_rqst *rqstp, __be32 *p)
 {
+	struct xdr_stream *xdr = &rqstp->rq_xdr_stream;
 	struct nfsd_createargs *args = rqstp->rq_argp;
 
-	if (   !(p = decode_fh(p, &args->fh))
-	    || !(p = decode_filename(p, &args->name, &args->len)))
-		return 0;
-	p = decode_sattr(p, &args->attrs, nfsd_user_namespace(rqstp));
-
-	return xdr_argsize_check(rqstp, p);
+	if (!svcxdr_decode_diropargs(xdr, &args->fh, &args->name, &args->len))
+		return XDR_DECODE_FAILED;
+	return svcxdr_decode_sattr(rqstp, xdr, &args->attrs);
 }
 
 int