mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-14 12:37:32 +00:00
Code Issues Releases Wiki Activity

NFSD: Update READDIR3args decoders to use struct xdr_stream

Browse source 
As an additional clean up, neither nfsd3_proc_readdir() nor
nfsd3_proc_readdirplus() make use of the dircount argument, so
remove it from struct nfsd3_readdirargs.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Chuck Lever 2020-10-19 13:23:52 -04:00
parent 40116ebd09
commit 9cedc2e64c
2 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
fs/nfsd/nfs3xdr.c
View file

@ -559,33 +559,43 @@ nfs3svc_decode_linkargs(struct svc_rqst *rqstp, __be32 *p)
int int
nfs3svc_decode_readdirargs(struct svc_rqst *rqstp, __be32 *p) nfs3svc_decode_readdirargs(struct svc_rqst *rqstp, __be32 *p)
{ {
struct xdr_stream *xdr = &rqstp->rq_arg_stream;
struct nfsd3_readdirargs *args = rqstp->rq_argp; struct nfsd3_readdirargs *args = rqstp->rq_argp;
p = decode_fh(p, &args->fh); if (!svcxdr_decode_nfs_fh3(xdr, &args->fh))
if (!p) return 0;
if (xdr_stream_decode_u64(xdr, &args->cookie) < 0)
return 0;
args->verf = xdr_inline_decode(xdr, NFS3_COOKIEVERFSIZE);
if (!args->verf)
return 0;
if (xdr_stream_decode_u32(xdr, &args->count) < 0)
return 0; return 0;
p = xdr_decode_hyper(p, &args->cookie);
args->verf = p; p += 2;
args->dircount = ~0;
args->count = ntohl(*p++);
return xdr_argsize_check(rqstp, p); return 1;
} }
int int
nfs3svc_decode_readdirplusargs(struct svc_rqst *rqstp, __be32 *p) nfs3svc_decode_readdirplusargs(struct svc_rqst *rqstp, __be32 *p)
{ {
struct xdr_stream *xdr = &rqstp->rq_arg_stream;
struct nfsd3_readdirargs *args = rqstp->rq_argp; struct nfsd3_readdirargs *args = rqstp->rq_argp;
u32 dircount;
p = decode_fh(p, &args->fh); if (!svcxdr_decode_nfs_fh3(xdr, &args->fh))
if (!p) return 0;
if (xdr_stream_decode_u64(xdr, &args->cookie) < 0)
return 0;
args->verf = xdr_inline_decode(xdr, NFS3_COOKIEVERFSIZE);
if (!args->verf)
return 0;
/* dircount is ignored */
if (xdr_stream_decode_u32(xdr, &dircount) < 0)
return 0;
if (xdr_stream_decode_u32(xdr, &args->count) < 0)
return 0; return 0;
p = xdr_decode_hyper(p, &args->cookie);
args->verf = p; p += 2;
args->dircount = ntohl(*p++);
args->count = ntohl(*p++);
return xdr_argsize_check(rqstp, p); return 1;
} }
int int

1
fs/nfsd/xdr3.h
View file

@ -90,7 +90,6 @@ struct nfsd3_symlinkargs {
struct nfsd3_readdirargs { struct nfsd3_readdirargs {
struct svc_fh fh; struct svc_fh fh;
__u64 cookie; __u64 cookie;
__u32 dircount;
__u32 count; __u32 count;
__be32 * verf; __be32 * verf;
}; };