Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 026fec7e authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

sunrpc: properly type pc_decode callbacks 



Drop the argp argument as it can trivially be derived from the rqstp
argument.  With that all functions now have the same prototype, and we
can remove the unsafe casting to kxdrproc_t.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 8537488b

fs/lockd/svc4proc.c

+1 −1
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ struct nlm_void { int dummy; }; 


#define PROC(name, xargt, xrest, argt, rest, respsize)	\

 { .pc_func	= nlm4svc_proc_##name,	\

   .pc_decode	= (kxdrproc_t) nlm4svc_decode_##xargt,	\

   .pc_decode	= nlm4svc_decode_##xargt,	\

   .pc_encode	= (kxdrproc_t) nlm4svc_encode_##xrest,	\

   .pc_release	= NULL,					\

   .pc_argsize	= sizeof(struct nlm_##argt),		\

fs/lockd/svcproc.c

+1 −1
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ struct nlm_void { int dummy; }; 


#define PROC(name, xargt, xrest, argt, rest, respsize)	\

 { .pc_func	= nlmsvc_proc_##name,			\

   .pc_decode	= (kxdrproc_t) nlmsvc_decode_##xargt,	\

   .pc_decode	= nlmsvc_decode_##xargt,		\

   .pc_encode	= (kxdrproc_t) nlmsvc_encode_##xrest,	\

   .pc_release	= NULL,					\

   .pc_argsize	= sizeof(struct nlm_##argt),		\

fs/lockd/xdr.c

+20 −9
Original line number Diff line number Diff line
@@ -182,8 +182,9 @@ nlm_encode_testres(__be32 *p, struct nlm_res *resp) 
 * First, the server side XDR functions

 */

int

nlmsvc_decode_testargs(struct svc_rqst *rqstp, __be32 *p, nlm_args *argp)

nlmsvc_decode_testargs(struct svc_rqst *rqstp, __be32 *p)

{

	struct nlm_args *argp = rqstp->rq_argp;

	u32	exclusive;



	if (!(p = nlm_decode_cookie(p, &argp->cookie)))
@@ -207,8 +208,9 @@ nlmsvc_encode_testres(struct svc_rqst *rqstp, __be32 *p, struct nlm_res *resp) 
}



int

nlmsvc_decode_lockargs(struct svc_rqst *rqstp, __be32 *p, nlm_args *argp)

nlmsvc_decode_lockargs(struct svc_rqst *rqstp, __be32 *p)

{

	struct nlm_args *argp = rqstp->rq_argp;

	u32	exclusive;



	if (!(p = nlm_decode_cookie(p, &argp->cookie)))
@@ -227,8 +229,9 @@ nlmsvc_decode_lockargs(struct svc_rqst *rqstp, __be32 *p, nlm_args *argp) 
}



int

nlmsvc_decode_cancargs(struct svc_rqst *rqstp, __be32 *p, nlm_args *argp)

nlmsvc_decode_cancargs(struct svc_rqst *rqstp, __be32 *p)

{

	struct nlm_args *argp = rqstp->rq_argp;

	u32	exclusive;



	if (!(p = nlm_decode_cookie(p, &argp->cookie)))
@@ -243,8 +246,10 @@ nlmsvc_decode_cancargs(struct svc_rqst *rqstp, __be32 *p, nlm_args *argp) 
}



int

nlmsvc_decode_unlockargs(struct svc_rqst *rqstp, __be32 *p, nlm_args *argp)

nlmsvc_decode_unlockargs(struct svc_rqst *rqstp, __be32 *p)

{

	struct nlm_args *argp = rqstp->rq_argp;



	if (!(p = nlm_decode_cookie(p, &argp->cookie))

	 || !(p = nlm_decode_lock(p, &argp->lock)))

		return 0;
@@ -253,8 +258,9 @@ nlmsvc_decode_unlockargs(struct svc_rqst *rqstp, __be32 *p, nlm_args *argp) 
}



int

nlmsvc_decode_shareargs(struct svc_rqst *rqstp, __be32 *p, nlm_args *argp)

nlmsvc_decode_shareargs(struct svc_rqst *rqstp, __be32 *p)

{

	struct nlm_args *argp = rqstp->rq_argp;

	struct nlm_lock	*lock = &argp->lock;



	memset(lock, 0, sizeof(*lock));
@@ -293,8 +299,9 @@ nlmsvc_encode_res(struct svc_rqst *rqstp, __be32 *p, struct nlm_res *resp) 
}



int

nlmsvc_decode_notify(struct svc_rqst *rqstp, __be32 *p, struct nlm_args *argp)

nlmsvc_decode_notify(struct svc_rqst *rqstp, __be32 *p)

{

	struct nlm_args *argp = rqstp->rq_argp;

	struct nlm_lock	*lock = &argp->lock;



	if (!(p = xdr_decode_string_inplace(p, &lock->caller,
@@ -305,8 +312,10 @@ nlmsvc_decode_notify(struct svc_rqst *rqstp, __be32 *p, struct nlm_args *argp) 
}



int

nlmsvc_decode_reboot(struct svc_rqst *rqstp, __be32 *p, struct nlm_reboot *argp)

nlmsvc_decode_reboot(struct svc_rqst *rqstp, __be32 *p)

{

	struct nlm_reboot *argp = rqstp->rq_argp;



	if (!(p = xdr_decode_string_inplace(p, &argp->mon, &argp->len, SM_MAXSTRLEN)))

		return 0;

	argp->state = ntohl(*p++);
@@ -316,8 +325,10 @@ nlmsvc_decode_reboot(struct svc_rqst *rqstp, __be32 *p, struct nlm_reboot *argp) 
}



int

nlmsvc_decode_res(struct svc_rqst *rqstp, __be32 *p, struct nlm_res *resp)

nlmsvc_decode_res(struct svc_rqst *rqstp, __be32 *p)

{

	struct nlm_res *resp = rqstp->rq_argp;



	if (!(p = nlm_decode_cookie(p, &resp->cookie)))

		return 0;

	resp->status = *p++;
@@ -325,7 +336,7 @@ nlmsvc_decode_res(struct svc_rqst *rqstp, __be32 *p, struct nlm_res *resp) 
}



int

nlmsvc_decode_void(struct svc_rqst *rqstp, __be32 *p, void *dummy)

nlmsvc_decode_void(struct svc_rqst *rqstp, __be32 *p)

{

	return xdr_argsize_check(rqstp, p);

}

fs/lockd/xdr4.c

+20 −9
Original line number Diff line number Diff line
@@ -179,8 +179,9 @@ nlm4_encode_testres(__be32 *p, struct nlm_res *resp) 
 * First, the server side XDR functions

 */

int

nlm4svc_decode_testargs(struct svc_rqst *rqstp, __be32 *p, nlm_args *argp)

nlm4svc_decode_testargs(struct svc_rqst *rqstp, __be32 *p)

{

	struct nlm_args *argp = rqstp->rq_argp;

	u32	exclusive;



	if (!(p = nlm4_decode_cookie(p, &argp->cookie)))
@@ -204,8 +205,9 @@ nlm4svc_encode_testres(struct svc_rqst *rqstp, __be32 *p, struct nlm_res *resp) 
}



int

nlm4svc_decode_lockargs(struct svc_rqst *rqstp, __be32 *p, nlm_args *argp)

nlm4svc_decode_lockargs(struct svc_rqst *rqstp, __be32 *p)

{

	struct nlm_args *argp = rqstp->rq_argp;

	u32	exclusive;



	if (!(p = nlm4_decode_cookie(p, &argp->cookie)))
@@ -224,8 +226,9 @@ nlm4svc_decode_lockargs(struct svc_rqst *rqstp, __be32 *p, nlm_args *argp) 
}



int

nlm4svc_decode_cancargs(struct svc_rqst *rqstp, __be32 *p, nlm_args *argp)

nlm4svc_decode_cancargs(struct svc_rqst *rqstp, __be32 *p)

{

	struct nlm_args *argp = rqstp->rq_argp;

	u32	exclusive;



	if (!(p = nlm4_decode_cookie(p, &argp->cookie)))
@@ -240,8 +243,10 @@ nlm4svc_decode_cancargs(struct svc_rqst *rqstp, __be32 *p, nlm_args *argp) 
}



int

nlm4svc_decode_unlockargs(struct svc_rqst *rqstp, __be32 *p, nlm_args *argp)

nlm4svc_decode_unlockargs(struct svc_rqst *rqstp, __be32 *p)

{

	struct nlm_args *argp = rqstp->rq_argp;



	if (!(p = nlm4_decode_cookie(p, &argp->cookie))

	 || !(p = nlm4_decode_lock(p, &argp->lock)))

		return 0;
@@ -250,8 +255,9 @@ nlm4svc_decode_unlockargs(struct svc_rqst *rqstp, __be32 *p, nlm_args *argp) 
}



int

nlm4svc_decode_shareargs(struct svc_rqst *rqstp, __be32 *p, nlm_args *argp)

nlm4svc_decode_shareargs(struct svc_rqst *rqstp, __be32 *p)

{

	struct nlm_args *argp = rqstp->rq_argp;

	struct nlm_lock	*lock = &argp->lock;



	memset(lock, 0, sizeof(*lock));
@@ -290,8 +296,9 @@ nlm4svc_encode_res(struct svc_rqst *rqstp, __be32 *p, struct nlm_res *resp) 
}



int

nlm4svc_decode_notify(struct svc_rqst *rqstp, __be32 *p, struct nlm_args *argp)

nlm4svc_decode_notify(struct svc_rqst *rqstp, __be32 *p)

{

	struct nlm_args *argp = rqstp->rq_argp;

	struct nlm_lock	*lock = &argp->lock;



	if (!(p = xdr_decode_string_inplace(p, &lock->caller,
@@ -302,8 +309,10 @@ nlm4svc_decode_notify(struct svc_rqst *rqstp, __be32 *p, struct nlm_args *argp) 
}



int

nlm4svc_decode_reboot(struct svc_rqst *rqstp, __be32 *p, struct nlm_reboot *argp)

nlm4svc_decode_reboot(struct svc_rqst *rqstp, __be32 *p)

{

	struct nlm_reboot *argp = rqstp->rq_argp;



	if (!(p = xdr_decode_string_inplace(p, &argp->mon, &argp->len, SM_MAXSTRLEN)))

		return 0;

	argp->state = ntohl(*p++);
@@ -313,8 +322,10 @@ nlm4svc_decode_reboot(struct svc_rqst *rqstp, __be32 *p, struct nlm_reboot *argp 
}



int

nlm4svc_decode_res(struct svc_rqst *rqstp, __be32 *p, struct nlm_res *resp)

nlm4svc_decode_res(struct svc_rqst *rqstp, __be32 *p)

{

	struct nlm_res *resp = rqstp->rq_argp;



	if (!(p = nlm4_decode_cookie(p, &resp->cookie)))

		return 0;

	resp->status = *p++;
@@ -322,7 +333,7 @@ nlm4svc_decode_res(struct svc_rqst *rqstp, __be32 *p, struct nlm_res *resp) 
}



int

nlm4svc_decode_void(struct svc_rqst *rqstp, __be32 *p, void *dummy)

nlm4svc_decode_void(struct svc_rqst *rqstp, __be32 *p)

{

	return xdr_argsize_check(rqstp, p);

}

fs/nfs/callback_xdr.c

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static __be32 nfs4_callback_null(struct svc_rqst *rqstp) 
	return htonl(NFS4_OK);

}



static int nfs4_decode_void(struct svc_rqst *rqstp, __be32 *p, void *dummy)

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

{

	return xdr_argsize_check(rqstp, p);

}
@@ -998,7 +998,7 @@ static struct callback_op callback_ops[] = { 
static struct svc_procedure nfs4_callback_procedures1[] = {

	[CB_NULL] = {

		.pc_func = nfs4_callback_null,

		.pc_decode = (kxdrproc_t)nfs4_decode_void,

		.pc_decode = nfs4_decode_void,

		.pc_encode = (kxdrproc_t)nfs4_encode_void,

		.pc_xdrressize = 1,

	},