xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFSD: Update the NFSv2 READDIR argument decoder to use struct xdr_stream

Browse Source 
[ Upstream commit 8688361ae2edb8f7e61d926dc5000c9a44f29370 ]

As an additional clean up, move code not related to XDR decoding
into readdir's .pc_func call out.

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-19 14:15:51 -04:00
committed by Greg Kroah-Hartman
parent 672111a408
commit 7d9ab8ee57
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fs/nfsd/nfsxdr.c
View File

@@ -381,15 +381,17 @@ nfssvc_decode_symlinkargs(struct svc_rqst *rqstp, __be32 *p)
int int
nfssvc_decode_readdirargs(struct svc_rqst *rqstp, __be32 *p) nfssvc_decode_readdirargs(struct svc_rqst *rqstp, __be32 *p)
{ {
struct xdr_stream *xdr = &rqstp->rq_arg_stream;
struct nfsd_readdirargs *args = rqstp->rq_argp; struct nfsd_readdirargs *args = rqstp->rq_argp;
p = decode_fh(p, &args->fh); if (!svcxdr_decode_fhandle(xdr, &args->fh))
if (!p) return 0;
if (xdr_stream_decode_u32(xdr, &args->cookie) < 0)
return 0;
if (xdr_stream_decode_u32(xdr, &args->count) < 0)
return 0; return 0;
args->cookie = ntohl(*p++);
args->count = ntohl(*p++);
return xdr_argsize_check(rqstp, p); return 1;
} }
/* /*