NFSD: Update the CREATE3args decoder to use struct xdr_stream

[ Upstream commit 6b3a11960d898b25a30103cc6a2ff0b24b90a83b ]

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Chuck Lever 2020-10-20 15:56:11 -04:00 committed by Ksawlii
parent c591d746bf
commit 0112701439

View file

@ -580,26 +580,26 @@ nfs3svc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p)
int int
nfs3svc_decode_createargs(struct svc_rqst *rqstp, __be32 *p) nfs3svc_decode_createargs(struct svc_rqst *rqstp, __be32 *p)
{ {
struct xdr_stream *xdr = &rqstp->rq_arg_stream;
struct nfsd3_createargs *args = rqstp->rq_argp; struct nfsd3_createargs *args = rqstp->rq_argp;
if (!(p = decode_fh(p, &args->fh)) if (!svcxdr_decode_diropargs3(xdr, &args->fh, &args->name, &args->len))
|| !(p = decode_filename(p, &args->name, &args->len)))
return 0; return 0;
if (xdr_stream_decode_u32(xdr, &args->createmode) < 0)
switch (args->createmode = ntohl(*p++)) { return 0;
switch (args->createmode) {
case NFS3_CREATE_UNCHECKED: case NFS3_CREATE_UNCHECKED:
case NFS3_CREATE_GUARDED: case NFS3_CREATE_GUARDED:
p = decode_sattr3(p, &args->attrs, nfsd_user_namespace(rqstp)); return svcxdr_decode_sattr3(rqstp, xdr, &args->attrs);
break;
case NFS3_CREATE_EXCLUSIVE: case NFS3_CREATE_EXCLUSIVE:
args->verf = p; args->verf = xdr_inline_decode(xdr, NFS3_CREATEVERFSIZE);
p += 2; if (!args->verf)
return 0;
break; break;
default: default:
return 0; return 0;
} }
return 1;
return xdr_argsize_check(rqstp, p);
} }
int int