Commit 16c66364 authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields
Browse files

SUNRPC: Replace the "__be32 *p" parameter to .pc_decode 



The passed-in value of the "__be32 *p" parameter is now unused in
every server-side XDR decoder, and can be removed.

Note also that there is a line in each decoder that sets up a local
pointer to a struct xdr_stream. Passing that pointer from the
dispatcher instead saves one line per decoder function.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 5b747a59

fs/lockd/svc.c

+1 −2
Original line number Diff line number Diff line
@@ -780,11 +780,10 @@ module_exit(exit_nlm); 
static int nlmsvc_dispatch(struct svc_rqst *rqstp, __be32 *statp)

{

	const struct svc_procedure *procp = rqstp->rq_procinfo;

	struct kvec *argv = rqstp->rq_arg.head;

	struct kvec *resv = rqstp->rq_res.head;



	svcxdr_init_decode(rqstp);

	if (!procp->pc_decode(rqstp, argv->iov_base))

	if (!procp->pc_decode(rqstp, &rqstp->rq_arg_stream))

		goto out_decode_err;



	*statp = procp->pc_func(rqstp);

fs/lockd/xdr.c

+10 −17
Original line number Diff line number Diff line
@@ -146,15 +146,14 @@ svcxdr_encode_testrply(struct xdr_stream *xdr, const struct nlm_res *resp) 
 */



int

nlmsvc_decode_void(struct svc_rqst *rqstp, __be32 *p)

nlmsvc_decode_void(struct svc_rqst *rqstp, struct xdr_stream *xdr)

{

	return 1;

}



int

nlmsvc_decode_testargs(struct svc_rqst *rqstp, __be32 *p)

nlmsvc_decode_testargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)

{

	struct xdr_stream *xdr = &rqstp->rq_arg_stream;

	struct nlm_args *argp = rqstp->rq_argp;

	u32 exclusive;
@@ -171,9 +170,8 @@ nlmsvc_decode_testargs(struct svc_rqst *rqstp, __be32 *p) 
}



int

nlmsvc_decode_lockargs(struct svc_rqst *rqstp, __be32 *p)

nlmsvc_decode_lockargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)

{

	struct xdr_stream *xdr = &rqstp->rq_arg_stream;

	struct nlm_args *argp = rqstp->rq_argp;

	u32 exclusive;
@@ -197,9 +195,8 @@ nlmsvc_decode_lockargs(struct svc_rqst *rqstp, __be32 *p) 
}



int

nlmsvc_decode_cancargs(struct svc_rqst *rqstp, __be32 *p)

nlmsvc_decode_cancargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)

{

	struct xdr_stream *xdr = &rqstp->rq_arg_stream;

	struct nlm_args *argp = rqstp->rq_argp;

	u32 exclusive;
@@ -218,9 +215,8 @@ nlmsvc_decode_cancargs(struct svc_rqst *rqstp, __be32 *p) 
}



int

nlmsvc_decode_unlockargs(struct svc_rqst *rqstp, __be32 *p)

nlmsvc_decode_unlockargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)

{

	struct xdr_stream *xdr = &rqstp->rq_arg_stream;

	struct nlm_args *argp = rqstp->rq_argp;



	if (!svcxdr_decode_cookie(xdr, &argp->cookie))
@@ -233,9 +229,8 @@ nlmsvc_decode_unlockargs(struct svc_rqst *rqstp, __be32 *p) 
}



int

nlmsvc_decode_res(struct svc_rqst *rqstp, __be32 *p)

nlmsvc_decode_res(struct svc_rqst *rqstp, struct xdr_stream *xdr)

{

	struct xdr_stream *xdr = &rqstp->rq_arg_stream;

	struct nlm_res *resp = rqstp->rq_argp;



	if (!svcxdr_decode_cookie(xdr, &resp->cookie))
@@ -247,10 +242,10 @@ nlmsvc_decode_res(struct svc_rqst *rqstp, __be32 *p) 
}



int

nlmsvc_decode_reboot(struct svc_rqst *rqstp, __be32 *p)

nlmsvc_decode_reboot(struct svc_rqst *rqstp, struct xdr_stream *xdr)

{

	struct xdr_stream *xdr = &rqstp->rq_arg_stream;

	struct nlm_reboot *argp = rqstp->rq_argp;

	__be32 *p;

	u32 len;



	if (xdr_stream_decode_u32(xdr, &len) < 0)
@@ -273,9 +268,8 @@ nlmsvc_decode_reboot(struct svc_rqst *rqstp, __be32 *p) 
}



int

nlmsvc_decode_shareargs(struct svc_rqst *rqstp, __be32 *p)

nlmsvc_decode_shareargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)

{

	struct xdr_stream *xdr = &rqstp->rq_arg_stream;

	struct nlm_args *argp = rqstp->rq_argp;

	struct nlm_lock	*lock = &argp->lock;
@@ -301,9 +295,8 @@ nlmsvc_decode_shareargs(struct svc_rqst *rqstp, __be32 *p) 
}



int

nlmsvc_decode_notify(struct svc_rqst *rqstp, __be32 *p)

nlmsvc_decode_notify(struct svc_rqst *rqstp, struct xdr_stream *xdr)

{

	struct xdr_stream *xdr = &rqstp->rq_arg_stream;

	struct nlm_args *argp = rqstp->rq_argp;

	struct nlm_lock	*lock = &argp->lock;

fs/lockd/xdr4.c

+10 −17
Original line number Diff line number Diff line
@@ -145,15 +145,14 @@ svcxdr_encode_testrply(struct xdr_stream *xdr, const struct nlm_res *resp) 
 */



int

nlm4svc_decode_void(struct svc_rqst *rqstp, __be32 *p)

nlm4svc_decode_void(struct svc_rqst *rqstp, struct xdr_stream *xdr)

{

	return 1;

}



int

nlm4svc_decode_testargs(struct svc_rqst *rqstp, __be32 *p)

nlm4svc_decode_testargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)

{

	struct xdr_stream *xdr = &rqstp->rq_arg_stream;

	struct nlm_args *argp = rqstp->rq_argp;

	u32 exclusive;
@@ -170,9 +169,8 @@ nlm4svc_decode_testargs(struct svc_rqst *rqstp, __be32 *p) 
}



int

nlm4svc_decode_lockargs(struct svc_rqst *rqstp, __be32 *p)

nlm4svc_decode_lockargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)

{

	struct xdr_stream *xdr = &rqstp->rq_arg_stream;

	struct nlm_args *argp = rqstp->rq_argp;

	u32 exclusive;
@@ -196,9 +194,8 @@ nlm4svc_decode_lockargs(struct svc_rqst *rqstp, __be32 *p) 
}



int

nlm4svc_decode_cancargs(struct svc_rqst *rqstp, __be32 *p)

nlm4svc_decode_cancargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)

{

	struct xdr_stream *xdr = &rqstp->rq_arg_stream;

	struct nlm_args *argp = rqstp->rq_argp;

	u32 exclusive;
@@ -216,9 +213,8 @@ nlm4svc_decode_cancargs(struct svc_rqst *rqstp, __be32 *p) 
}



int

nlm4svc_decode_unlockargs(struct svc_rqst *rqstp, __be32 *p)

nlm4svc_decode_unlockargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)

{

	struct xdr_stream *xdr = &rqstp->rq_arg_stream;

	struct nlm_args *argp = rqstp->rq_argp;



	if (!svcxdr_decode_cookie(xdr, &argp->cookie))
@@ -231,9 +227,8 @@ nlm4svc_decode_unlockargs(struct svc_rqst *rqstp, __be32 *p) 
}



int

nlm4svc_decode_res(struct svc_rqst *rqstp, __be32 *p)

nlm4svc_decode_res(struct svc_rqst *rqstp, struct xdr_stream *xdr)

{

	struct xdr_stream *xdr = &rqstp->rq_arg_stream;

	struct nlm_res *resp = rqstp->rq_argp;



	if (!svcxdr_decode_cookie(xdr, &resp->cookie))
@@ -245,10 +240,10 @@ nlm4svc_decode_res(struct svc_rqst *rqstp, __be32 *p) 
}



int

nlm4svc_decode_reboot(struct svc_rqst *rqstp, __be32 *p)

nlm4svc_decode_reboot(struct svc_rqst *rqstp, struct xdr_stream *xdr)

{

	struct xdr_stream *xdr = &rqstp->rq_arg_stream;

	struct nlm_reboot *argp = rqstp->rq_argp;

	__be32 *p;

	u32 len;



	if (xdr_stream_decode_u32(xdr, &len) < 0)
@@ -271,9 +266,8 @@ nlm4svc_decode_reboot(struct svc_rqst *rqstp, __be32 *p) 
}



int

nlm4svc_decode_shareargs(struct svc_rqst *rqstp, __be32 *p)

nlm4svc_decode_shareargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)

{

	struct xdr_stream *xdr = &rqstp->rq_arg_stream;

	struct nlm_args *argp = rqstp->rq_argp;

	struct nlm_lock	*lock = &argp->lock;
@@ -299,9 +293,8 @@ nlm4svc_decode_shareargs(struct svc_rqst *rqstp, __be32 *p) 
}



int

nlm4svc_decode_notify(struct svc_rqst *rqstp, __be32 *p)

nlm4svc_decode_notify(struct svc_rqst *rqstp, struct xdr_stream *xdr)

{

	struct xdr_stream *xdr = &rqstp->rq_arg_stream;

	struct nlm_args *argp = rqstp->rq_argp;

	struct nlm_lock	*lock = &argp->lock;

fs/nfsd/nfs2acl.c

+6 −6
Original line number Diff line number Diff line
@@ -188,9 +188,9 @@ static __be32 nfsacld_proc_access(struct svc_rqst *rqstp) 
 * XDR decode functions

 */



static int nfsaclsvc_decode_getaclargs(struct svc_rqst *rqstp, __be32 *p)

static int

nfsaclsvc_decode_getaclargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)

{

	struct xdr_stream *xdr = &rqstp->rq_arg_stream;

	struct nfsd3_getaclargs *argp = rqstp->rq_argp;



	if (!svcxdr_decode_fhandle(xdr, &argp->fh))
@@ -201,9 +201,9 @@ static int nfsaclsvc_decode_getaclargs(struct svc_rqst *rqstp, __be32 *p) 
	return 1;

}



static int nfsaclsvc_decode_setaclargs(struct svc_rqst *rqstp, __be32 *p)

static int

nfsaclsvc_decode_setaclargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)

{

	struct xdr_stream *xdr = &rqstp->rq_arg_stream;

	struct nfsd3_setaclargs *argp = rqstp->rq_argp;



	if (!svcxdr_decode_fhandle(xdr, &argp->fh))
@@ -222,9 +222,9 @@ static int nfsaclsvc_decode_setaclargs(struct svc_rqst *rqstp, __be32 *p) 
	return 1;

}



static int nfsaclsvc_decode_accessargs(struct svc_rqst *rqstp, __be32 *p)

static int

nfsaclsvc_decode_accessargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)

{

	struct xdr_stream *xdr = &rqstp->rq_arg_stream;

	struct nfsd3_accessargs *args = rqstp->rq_argp;



	if (!svcxdr_decode_fhandle(xdr, &args->fh))

fs/nfsd/nfs3acl.c

+4 −4
Original line number Diff line number Diff line
@@ -127,9 +127,9 @@ static __be32 nfsd3_proc_setacl(struct svc_rqst *rqstp) 
 * XDR decode functions

 */



static int nfs3svc_decode_getaclargs(struct svc_rqst *rqstp, __be32 *p)

static int

nfs3svc_decode_getaclargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)

{

	struct xdr_stream *xdr = &rqstp->rq_arg_stream;

	struct nfsd3_getaclargs *args = rqstp->rq_argp;



	if (!svcxdr_decode_nfs_fh3(xdr, &args->fh))
@@ -140,9 +140,9 @@ static int nfs3svc_decode_getaclargs(struct svc_rqst *rqstp, __be32 *p) 
	return 1;

}



static int nfs3svc_decode_setaclargs(struct svc_rqst *rqstp, __be32 *p)

static int

nfs3svc_decode_setaclargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)

{

	struct xdr_stream *xdr = &rqstp->rq_arg_stream;

	struct nfsd3_setaclargs *argp = rqstp->rq_argp;



	if (!svcxdr_decode_nfs_fh3(xdr, &argp->fh))