Commit 9cedc2e6 authored by Chuck Lever's avatar Chuck Lever
Browse files

NFSD: Update READDIR3args decoders to use struct xdr_stream 



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: default avatarChuck Lever <chuck.lever@oracle.com>
parent 40116ebd

fs/nfsd/nfs3xdr.c

+24 −14
Original line number Diff line number Diff line
@@ -559,33 +559,43 @@ nfs3svc_decode_linkargs(struct svc_rqst *rqstp, __be32 *p) 
int

nfs3svc_decode_readdirargs(struct svc_rqst *rqstp, __be32 *p)

{

	struct xdr_stream *xdr = &rqstp->rq_arg_stream;

	struct nfsd3_readdirargs *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->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;

	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

nfs3svc_decode_readdirplusargs(struct svc_rqst *rqstp, __be32 *p)

{

	struct xdr_stream *xdr = &rqstp->rq_arg_stream;

	struct nfsd3_readdirargs *args = rqstp->rq_argp;

	u32 dircount;



	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->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;

	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

fs/nfsd/xdr3.h

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ struct nfsd3_symlinkargs { 
struct nfsd3_readdirargs {

	struct svc_fh		fh;

	__u64			cookie;

	__u32			dircount;

	__u32			count;

	__be32 *		verf;

};