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

Commit a6beb732 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

sunrpc: properly type pc_func callbacks 



Drop the argp and resp arguments as they 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 svc_procfunc as well as the
svc_procfunc typedef itself.

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

fs/lockd/svc4proc.c

+75 −43
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp, 
 * NULL: Test for presence of service

 */

static __be32

nlm4svc_proc_null(struct svc_rqst *rqstp, void *argp, void *resp)

nlm4svc_proc_null(struct svc_rqst *rqstp)

{

	dprintk("lockd: NULL          called\n");

	return rpc_success;
@@ -72,9 +72,9 @@ nlm4svc_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) 
 * TEST: Check for conflicting lock

 */

static __be32

nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp,

				         struct nlm_res  *resp)

__nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_res *resp)

{

	struct nlm_args *argp = rqstp->rq_argp;

	struct nlm_host	*host;

	struct nlm_file	*file;

	__be32 rc = rpc_success;
@@ -99,9 +99,15 @@ nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp, 
}



static __be32

nlm4svc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp,

				         struct nlm_res  *resp)

nlm4svc_proc_test(struct svc_rqst *rqstp)

{

	return __nlm4svc_proc_test(rqstp, rqstp->rq_resp);

}



static __be32

__nlm4svc_proc_lock(struct svc_rqst *rqstp, struct nlm_res *resp)

{

	struct nlm_args *argp = rqstp->rq_argp;

	struct nlm_host	*host;

	struct nlm_file	*file;

	__be32 rc = rpc_success;
@@ -141,9 +147,15 @@ nlm4svc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp, 
}



static __be32

nlm4svc_proc_cancel(struct svc_rqst *rqstp, struct nlm_args *argp,

				           struct nlm_res  *resp)

nlm4svc_proc_lock(struct svc_rqst *rqstp)

{

	return __nlm4svc_proc_lock(rqstp, rqstp->rq_resp);

}



static __be32

__nlm4svc_proc_cancel(struct svc_rqst *rqstp, struct nlm_res *resp)

{

	struct nlm_args *argp = rqstp->rq_argp;

	struct nlm_host	*host;

	struct nlm_file	*file;
@@ -170,13 +182,19 @@ nlm4svc_proc_cancel(struct svc_rqst *rqstp, struct nlm_args *argp, 
	return rpc_success;

}



static __be32

nlm4svc_proc_cancel(struct svc_rqst *rqstp)

{

	return __nlm4svc_proc_cancel(rqstp, rqstp->rq_resp);

}



/*

 * UNLOCK: release a lock

 */

static __be32

nlm4svc_proc_unlock(struct svc_rqst *rqstp, struct nlm_args *argp,

				           struct nlm_res  *resp)

__nlm4svc_proc_unlock(struct svc_rqst *rqstp, struct nlm_res *resp)

{

	struct nlm_args *argp = rqstp->rq_argp;

	struct nlm_host	*host;

	struct nlm_file	*file;
@@ -203,14 +221,21 @@ nlm4svc_proc_unlock(struct svc_rqst *rqstp, struct nlm_args *argp, 
	return rpc_success;

}



static __be32

nlm4svc_proc_unlock(struct svc_rqst *rqstp)

{

	return __nlm4svc_proc_unlock(rqstp, rqstp->rq_resp);

}



/*

 * GRANTED: A server calls us to tell that a process' lock request

 * was granted

 */

static __be32

nlm4svc_proc_granted(struct svc_rqst *rqstp, struct nlm_args *argp,

				            struct nlm_res  *resp)

__nlm4svc_proc_granted(struct svc_rqst *rqstp, struct nlm_res *resp)

{

	struct nlm_args *argp = rqstp->rq_argp;



	resp->cookie = argp->cookie;



	dprintk("lockd: GRANTED       called\n");
@@ -219,6 +244,12 @@ nlm4svc_proc_granted(struct svc_rqst *rqstp, struct nlm_args *argp, 
	return rpc_success;

}



static __be32

nlm4svc_proc_granted(struct svc_rqst *rqstp)

{

	return __nlm4svc_proc_granted(rqstp, rqstp->rq_resp);

}



/*

 * This is the generic lockd callback for async RPC calls

 */
@@ -243,9 +274,10 @@ static const struct rpc_call_ops nlm4svc_callback_ops = { 
 * because we send the callback before the reply proper. I hope this

 * doesn't break any clients.

 */

static __be32 nlm4svc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args *argp,

		__be32 (*func)(struct svc_rqst *, struct nlm_args *, struct nlm_res  *))

static __be32 nlm4svc_callback(struct svc_rqst *rqstp, u32 proc,

		__be32 (*func)(struct svc_rqst *,  struct nlm_res *))

{

	struct nlm_args *argp = rqstp->rq_argp;

	struct nlm_host	*host;

	struct nlm_rqst	*call;

	__be32 stat;
@@ -261,7 +293,7 @@ static __be32 nlm4svc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args 
	if (call == NULL)

		return rpc_system_err;



	stat = func(rqstp, argp, &call->a_res);

	stat = func(rqstp, &call->a_res);

	if (stat != 0) {

		nlmsvc_release_call(call);

		return stat;
@@ -273,48 +305,44 @@ static __be32 nlm4svc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args 
	return rpc_success;

}



static __be32 nlm4svc_proc_test_msg(struct svc_rqst *rqstp, struct nlm_args *argp,

					     void	     *resp)

static __be32 nlm4svc_proc_test_msg(struct svc_rqst *rqstp)

{

	dprintk("lockd: TEST_MSG      called\n");

	return nlm4svc_callback(rqstp, NLMPROC_TEST_RES, argp, nlm4svc_proc_test);

	return nlm4svc_callback(rqstp, NLMPROC_TEST_RES, __nlm4svc_proc_test);

}



static __be32 nlm4svc_proc_lock_msg(struct svc_rqst *rqstp, struct nlm_args *argp,

					     void	     *resp)

static __be32 nlm4svc_proc_lock_msg(struct svc_rqst *rqstp)

{

	dprintk("lockd: LOCK_MSG      called\n");

	return nlm4svc_callback(rqstp, NLMPROC_LOCK_RES, argp, nlm4svc_proc_lock);

	return nlm4svc_callback(rqstp, NLMPROC_LOCK_RES, __nlm4svc_proc_lock);

}



static __be32 nlm4svc_proc_cancel_msg(struct svc_rqst *rqstp, struct nlm_args *argp,

					       void	       *resp)

static __be32 nlm4svc_proc_cancel_msg(struct svc_rqst *rqstp)

{

	dprintk("lockd: CANCEL_MSG    called\n");

	return nlm4svc_callback(rqstp, NLMPROC_CANCEL_RES, argp, nlm4svc_proc_cancel);

	return nlm4svc_callback(rqstp, NLMPROC_CANCEL_RES, __nlm4svc_proc_cancel);

}



static __be32 nlm4svc_proc_unlock_msg(struct svc_rqst *rqstp, struct nlm_args *argp,

                                               void            *resp)

static __be32 nlm4svc_proc_unlock_msg(struct svc_rqst *rqstp)

{

	dprintk("lockd: UNLOCK_MSG    called\n");

	return nlm4svc_callback(rqstp, NLMPROC_UNLOCK_RES, argp, nlm4svc_proc_unlock);

	return nlm4svc_callback(rqstp, NLMPROC_UNLOCK_RES, __nlm4svc_proc_unlock);

}



static __be32 nlm4svc_proc_granted_msg(struct svc_rqst *rqstp, struct nlm_args *argp,

                                                void            *resp)

static __be32 nlm4svc_proc_granted_msg(struct svc_rqst *rqstp)

{

	dprintk("lockd: GRANTED_MSG   called\n");

	return nlm4svc_callback(rqstp, NLMPROC_GRANTED_RES, argp, nlm4svc_proc_granted);

	return nlm4svc_callback(rqstp, NLMPROC_GRANTED_RES, __nlm4svc_proc_granted);

}



/*

 * SHARE: create a DOS share or alter existing share.

 */

static __be32

nlm4svc_proc_share(struct svc_rqst *rqstp, struct nlm_args *argp,

				          struct nlm_res  *resp)

nlm4svc_proc_share(struct svc_rqst *rqstp)

{

	struct nlm_args *argp = rqstp->rq_argp;

	struct nlm_res *resp = rqstp->rq_resp;

	struct nlm_host	*host;

	struct nlm_file	*file;
@@ -345,9 +373,10 @@ nlm4svc_proc_share(struct svc_rqst *rqstp, struct nlm_args *argp, 
 * UNSHARE: Release a DOS share.

 */

static __be32

nlm4svc_proc_unshare(struct svc_rqst *rqstp, struct nlm_args *argp,

				            struct nlm_res  *resp)

nlm4svc_proc_unshare(struct svc_rqst *rqstp)

{

	struct nlm_args *argp = rqstp->rq_argp;

	struct nlm_res *resp = rqstp->rq_resp;

	struct nlm_host	*host;

	struct nlm_file	*file;
@@ -378,22 +407,23 @@ nlm4svc_proc_unshare(struct svc_rqst *rqstp, struct nlm_args *argp, 
 * NM_LOCK: Create an unmonitored lock

 */

static __be32

nlm4svc_proc_nm_lock(struct svc_rqst *rqstp, struct nlm_args *argp,

				            struct nlm_res  *resp)

nlm4svc_proc_nm_lock(struct svc_rqst *rqstp)

{

	struct nlm_args *argp = rqstp->rq_argp;



	dprintk("lockd: NM_LOCK       called\n");



	argp->monitor = 0;		/* just clean the monitor flag */

	return nlm4svc_proc_lock(rqstp, argp, resp);

	return nlm4svc_proc_lock(rqstp);

}



/*

 * FREE_ALL: Release all locks and shares held by client

 */

static __be32

nlm4svc_proc_free_all(struct svc_rqst *rqstp, struct nlm_args *argp,

					     void            *resp)

nlm4svc_proc_free_all(struct svc_rqst *rqstp)

{

	struct nlm_args *argp = rqstp->rq_argp;

	struct nlm_host	*host;



	/* Obtain client */
@@ -409,9 +439,10 @@ nlm4svc_proc_free_all(struct svc_rqst *rqstp, struct nlm_args *argp, 
 * SM_NOTIFY: private callback from statd (not part of official NLM proto)

 */

static __be32

nlm4svc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp,

					      void	        *resp)

nlm4svc_proc_sm_notify(struct svc_rqst *rqstp)

{

	struct nlm_reboot *argp = rqstp->rq_argp;



	dprintk("lockd: SM_NOTIFY     called\n");



	if (!nlm_privileged_requester(rqstp)) {
@@ -429,9 +460,10 @@ nlm4svc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp, 
 * client sent a GRANTED_RES, let's remove the associated block

 */

static __be32

nlm4svc_proc_granted_res(struct svc_rqst *rqstp, struct nlm_res  *argp,

                                                void            *resp)

nlm4svc_proc_granted_res(struct svc_rqst *rqstp)

{

	struct nlm_res *argp = rqstp->rq_argp;



        if (!nlmsvc_ops)

                return rpc_success;
@@ -463,7 +495,7 @@ nlm4svc_proc_granted_res(struct svc_rqst *rqstp, struct nlm_res *argp, 
struct nlm_void			{ int dummy; };



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

 { .pc_func	= (svc_procfunc) nlm4svc_proc_##name,	\

 { .pc_func	= nlm4svc_proc_##name,	\

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

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

   .pc_release	= NULL,					\

fs/lockd/svcproc.c

+75 −43
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ nlmsvc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp, 
 * NULL: Test for presence of service

 */

static __be32

nlmsvc_proc_null(struct svc_rqst *rqstp, void *argp, void *resp)

nlmsvc_proc_null(struct svc_rqst *rqstp)

{

	dprintk("lockd: NULL          called\n");

	return rpc_success;
@@ -102,9 +102,9 @@ nlmsvc_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) 
 * TEST: Check for conflicting lock

 */

static __be32

nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp,

				         struct nlm_res  *resp)

__nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_res *resp)

{

	struct nlm_args *argp = rqstp->rq_argp;

	struct nlm_host	*host;

	struct nlm_file	*file;

	__be32 rc = rpc_success;
@@ -130,9 +130,15 @@ nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp, 
}



static __be32

nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp,

				         struct nlm_res  *resp)

nlmsvc_proc_test(struct svc_rqst *rqstp)

{

	return __nlmsvc_proc_test(rqstp, rqstp->rq_resp);

}



static __be32

__nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_res *resp)

{

	struct nlm_args *argp = rqstp->rq_argp;

	struct nlm_host	*host;

	struct nlm_file	*file;

	__be32 rc = rpc_success;
@@ -172,9 +178,15 @@ nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp, 
}



static __be32

nlmsvc_proc_cancel(struct svc_rqst *rqstp, struct nlm_args *argp,

				           struct nlm_res  *resp)

nlmsvc_proc_lock(struct svc_rqst *rqstp)

{

	return __nlmsvc_proc_lock(rqstp, rqstp->rq_resp);

}



static __be32

__nlmsvc_proc_cancel(struct svc_rqst *rqstp, struct nlm_res *resp)

{

	struct nlm_args *argp = rqstp->rq_argp;

	struct nlm_host	*host;

	struct nlm_file	*file;

	struct net *net = SVC_NET(rqstp);
@@ -202,13 +214,19 @@ nlmsvc_proc_cancel(struct svc_rqst *rqstp, struct nlm_args *argp, 
	return rpc_success;

}



static __be32

nlmsvc_proc_cancel(struct svc_rqst *rqstp)

{

	return __nlmsvc_proc_cancel(rqstp, rqstp->rq_resp);

}



/*

 * UNLOCK: release a lock

 */

static __be32

nlmsvc_proc_unlock(struct svc_rqst *rqstp, struct nlm_args *argp,

				           struct nlm_res  *resp)

__nlmsvc_proc_unlock(struct svc_rqst *rqstp, struct nlm_res *resp)

{

	struct nlm_args *argp = rqstp->rq_argp;

	struct nlm_host	*host;

	struct nlm_file	*file;

	struct net *net = SVC_NET(rqstp);
@@ -236,14 +254,21 @@ nlmsvc_proc_unlock(struct svc_rqst *rqstp, struct nlm_args *argp, 
	return rpc_success;

}



static __be32

nlmsvc_proc_unlock(struct svc_rqst *rqstp)

{

	return __nlmsvc_proc_unlock(rqstp, rqstp->rq_resp);

}



/*

 * GRANTED: A server calls us to tell that a process' lock request

 * was granted

 */

static __be32

nlmsvc_proc_granted(struct svc_rqst *rqstp, struct nlm_args *argp,

				            struct nlm_res  *resp)

__nlmsvc_proc_granted(struct svc_rqst *rqstp, struct nlm_res *resp)

{

	struct nlm_args *argp = rqstp->rq_argp;



	resp->cookie = argp->cookie;



	dprintk("lockd: GRANTED       called\n");
@@ -252,6 +277,12 @@ nlmsvc_proc_granted(struct svc_rqst *rqstp, struct nlm_args *argp, 
	return rpc_success;

}



static __be32

nlmsvc_proc_granted(struct svc_rqst *rqstp)

{

	return __nlmsvc_proc_granted(rqstp, rqstp->rq_resp);

}



/*

 * This is the generic lockd callback for async RPC calls

 */
@@ -284,9 +315,10 @@ static const struct rpc_call_ops nlmsvc_callback_ops = { 
 * because we send the callback before the reply proper. I hope this

 * doesn't break any clients.

 */

static __be32 nlmsvc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args *argp,

		__be32 (*func)(struct svc_rqst *, struct nlm_args *, struct nlm_res  *))

static __be32 nlmsvc_callback(struct svc_rqst *rqstp, u32 proc,

		__be32 (*func)(struct svc_rqst *, struct nlm_res *))

{

	struct nlm_args *argp = rqstp->rq_argp;

	struct nlm_host	*host;

	struct nlm_rqst	*call;

	__be32 stat;
@@ -302,7 +334,7 @@ static __be32 nlmsvc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args 
	if (call == NULL)

		return rpc_system_err;



	stat = func(rqstp, argp, &call->a_res);

	stat = func(rqstp, &call->a_res);

	if (stat != 0) {

		nlmsvc_release_call(call);

		return stat;
@@ -314,50 +346,46 @@ static __be32 nlmsvc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args 
	return rpc_success;

}



static __be32 nlmsvc_proc_test_msg(struct svc_rqst *rqstp, struct nlm_args *argp,

					     void	     *resp)

static __be32 nlmsvc_proc_test_msg(struct svc_rqst *rqstp)

{

	dprintk("lockd: TEST_MSG      called\n");

	return nlmsvc_callback(rqstp, NLMPROC_TEST_RES, argp, nlmsvc_proc_test);

	return nlmsvc_callback(rqstp, NLMPROC_TEST_RES, __nlmsvc_proc_test);

}



static __be32 nlmsvc_proc_lock_msg(struct svc_rqst *rqstp, struct nlm_args *argp,

					     void	     *resp)

static __be32 nlmsvc_proc_lock_msg(struct svc_rqst *rqstp)

{

	dprintk("lockd: LOCK_MSG      called\n");

	return nlmsvc_callback(rqstp, NLMPROC_LOCK_RES, argp, nlmsvc_proc_lock);

	return nlmsvc_callback(rqstp, NLMPROC_LOCK_RES, __nlmsvc_proc_lock);

}



static __be32 nlmsvc_proc_cancel_msg(struct svc_rqst *rqstp, struct nlm_args *argp,

					       void	       *resp)

static __be32 nlmsvc_proc_cancel_msg(struct svc_rqst *rqstp)

{

	dprintk("lockd: CANCEL_MSG    called\n");

	return nlmsvc_callback(rqstp, NLMPROC_CANCEL_RES, argp, nlmsvc_proc_cancel);

	return nlmsvc_callback(rqstp, NLMPROC_CANCEL_RES, __nlmsvc_proc_cancel);

}



static __be32

nlmsvc_proc_unlock_msg(struct svc_rqst *rqstp, struct nlm_args *argp,

                                               void            *resp)

nlmsvc_proc_unlock_msg(struct svc_rqst *rqstp)

{

	dprintk("lockd: UNLOCK_MSG    called\n");

	return nlmsvc_callback(rqstp, NLMPROC_UNLOCK_RES, argp, nlmsvc_proc_unlock);

	return nlmsvc_callback(rqstp, NLMPROC_UNLOCK_RES, __nlmsvc_proc_unlock);

}



static __be32

nlmsvc_proc_granted_msg(struct svc_rqst *rqstp, struct nlm_args *argp,

                                                void            *resp)

nlmsvc_proc_granted_msg(struct svc_rqst *rqstp)

{

	dprintk("lockd: GRANTED_MSG   called\n");

	return nlmsvc_callback(rqstp, NLMPROC_GRANTED_RES, argp, nlmsvc_proc_granted);

	return nlmsvc_callback(rqstp, NLMPROC_GRANTED_RES, __nlmsvc_proc_granted);

}



/*

 * SHARE: create a DOS share or alter existing share.

 */

static __be32

nlmsvc_proc_share(struct svc_rqst *rqstp, struct nlm_args *argp,

				          struct nlm_res  *resp)

nlmsvc_proc_share(struct svc_rqst *rqstp)

{

	struct nlm_args *argp = rqstp->rq_argp;

	struct nlm_res *resp = rqstp->rq_resp;

	struct nlm_host	*host;

	struct nlm_file	*file;
@@ -388,9 +416,10 @@ nlmsvc_proc_share(struct svc_rqst *rqstp, struct nlm_args *argp, 
 * UNSHARE: Release a DOS share.

 */

static __be32

nlmsvc_proc_unshare(struct svc_rqst *rqstp, struct nlm_args *argp,

				            struct nlm_res  *resp)

nlmsvc_proc_unshare(struct svc_rqst *rqstp)

{

	struct nlm_args *argp = rqstp->rq_argp;

	struct nlm_res *resp = rqstp->rq_resp;

	struct nlm_host	*host;

	struct nlm_file	*file;
@@ -421,22 +450,23 @@ nlmsvc_proc_unshare(struct svc_rqst *rqstp, struct nlm_args *argp, 
 * NM_LOCK: Create an unmonitored lock

 */

static __be32

nlmsvc_proc_nm_lock(struct svc_rqst *rqstp, struct nlm_args *argp,

				            struct nlm_res  *resp)

nlmsvc_proc_nm_lock(struct svc_rqst *rqstp)

{

	struct nlm_args *argp = rqstp->rq_argp;



	dprintk("lockd: NM_LOCK       called\n");



	argp->monitor = 0;		/* just clean the monitor flag */

	return nlmsvc_proc_lock(rqstp, argp, resp);

	return nlmsvc_proc_lock(rqstp);

}



/*

 * FREE_ALL: Release all locks and shares held by client

 */

static __be32

nlmsvc_proc_free_all(struct svc_rqst *rqstp, struct nlm_args *argp,

					     void            *resp)

nlmsvc_proc_free_all(struct svc_rqst *rqstp)

{

	struct nlm_args *argp = rqstp->rq_argp;

	struct nlm_host	*host;



	/* Obtain client */
@@ -452,9 +482,10 @@ nlmsvc_proc_free_all(struct svc_rqst *rqstp, struct nlm_args *argp, 
 * SM_NOTIFY: private callback from statd (not part of official NLM proto)

 */

static __be32

nlmsvc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp,

					      void	        *resp)

nlmsvc_proc_sm_notify(struct svc_rqst *rqstp)

{

	struct nlm_reboot *argp = rqstp->rq_argp;



	dprintk("lockd: SM_NOTIFY     called\n");



	if (!nlm_privileged_requester(rqstp)) {
@@ -472,9 +503,10 @@ nlmsvc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp, 
 * client sent a GRANTED_RES, let's remove the associated block

 */

static __be32

nlmsvc_proc_granted_res(struct svc_rqst *rqstp, struct nlm_res  *argp,

                                                void            *resp)

nlmsvc_proc_granted_res(struct svc_rqst *rqstp)

{

	struct nlm_res *argp = rqstp->rq_argp;



	if (!nlmsvc_ops)

		return rpc_success;
@@ -505,7 +537,7 @@ nlmsvc_proc_granted_res(struct svc_rqst *rqstp, struct nlm_res *argp, 
struct nlm_void			{ int dummy; };



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

 { .pc_func	= (svc_procfunc) nlmsvc_proc_##name,	\

 { .pc_func	= nlmsvc_proc_##name,			\

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

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

   .pc_release	= NULL,					\

fs/nfs/callback_xdr.c

+4 −3
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ struct callback_op { 


static struct callback_op callback_ops[];



static __be32 nfs4_callback_null(struct svc_rqst *rqstp, void *argp, void *resp)

static __be32 nfs4_callback_null(struct svc_rqst *rqstp)

{

	return htonl(NFS4_OK);

}
@@ -880,7 +880,7 @@ static __be32 process_op(int nop, struct svc_rqst *rqstp, 
/*

 * Decode, process and encode a COMPOUND

 */

static __be32 nfs4_callback_compound(struct svc_rqst *rqstp, void *argp, void *resp)

static __be32 nfs4_callback_compound(struct svc_rqst *rqstp)

{

	struct cb_compound_hdr_arg hdr_arg = { 0 };

	struct cb_compound_hdr_res hdr_res = { NULL };
@@ -916,7 +916,8 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp, void *argp, void *r 


	while (status == 0 && nops != hdr_arg.nops) {

		status = process_op(nops, rqstp, &xdr_in,

				    argp, &xdr_out, resp, &cps);

				    rqstp->rq_argp, &xdr_out, rqstp->rq_resp,

				    &cps);

		nops++;

	}

fs/nfsd/nfs2acl.c

+14 −11
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
 * NULL call.

 */

static __be32

nfsacld_proc_null(struct svc_rqst *rqstp, void *argp, void *resp)

nfsacld_proc_null(struct svc_rqst *rqstp)

{

	return nfs_ok;

}
@@ -27,9 +27,10 @@ nfsacld_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) 
/*

 * Get the Access and/or Default ACL of a file.

 */

static __be32 nfsacld_proc_getacl(struct svc_rqst * rqstp,

		struct nfsd3_getaclargs *argp, struct nfsd3_getaclres *resp)

static __be32 nfsacld_proc_getacl(struct svc_rqst *rqstp)

{

	struct nfsd3_getaclargs *argp = rqstp->rq_argp;

	struct nfsd3_getaclres *resp = rqstp->rq_resp;

	struct posix_acl *acl;

	struct inode *inode;

	svc_fh *fh;
@@ -87,10 +88,10 @@ static __be32 nfsacld_proc_getacl(struct svc_rqst * rqstp, 
/*

 * Set the Access and/or Default ACL of a file.

 */

static __be32 nfsacld_proc_setacl(struct svc_rqst * rqstp,

		struct nfsd3_setaclargs *argp,

		struct nfsd_attrstat *resp)

static __be32 nfsacld_proc_setacl(struct svc_rqst *rqstp)

{

	struct nfsd3_setaclargs *argp = rqstp->rq_argp;

	struct nfsd_attrstat *resp = rqstp->rq_resp;

	struct inode *inode;

	svc_fh *fh;

	__be32 nfserr = 0;
@@ -141,9 +142,10 @@ static __be32 nfsacld_proc_setacl(struct svc_rqst * rqstp, 
/*

 * Check file attributes

 */

static __be32 nfsacld_proc_getattr(struct svc_rqst * rqstp,

		struct nfsd_fhandle *argp, struct nfsd_attrstat *resp)

static __be32 nfsacld_proc_getattr(struct svc_rqst *rqstp)

{

	struct nfsd_fhandle *argp = rqstp->rq_argp;

	struct nfsd_attrstat *resp = rqstp->rq_resp;

	__be32 nfserr;

	dprintk("nfsd: GETATTR  %s\n", SVCFH_fmt(&argp->fh));
@@ -158,9 +160,10 @@ static __be32 nfsacld_proc_getattr(struct svc_rqst * rqstp, 
/*

 * Check file access

 */

static __be32 nfsacld_proc_access(struct svc_rqst *rqstp, struct nfsd3_accessargs *argp,

		struct nfsd3_accessres *resp)

static __be32 nfsacld_proc_access(struct svc_rqst *rqstp)

{

	struct nfsd3_accessargs *argp = rqstp->rq_argp;

	struct nfsd3_accessres *resp = rqstp->rq_resp;

	__be32 nfserr;



	dprintk("nfsd: ACCESS(2acl)   %s 0x%x\n",
@@ -347,7 +350,7 @@ struct nfsd3_voidargs { int dummy; }; 


#define PROC(name, argt, rest, relt, cache, respsize)			\

{									\

	.pc_func	= (svc_procfunc) nfsacld_proc_##name,		\

	.pc_func	= nfsacld_proc_##name,				\

	.pc_decode	= (kxdrproc_t) nfsaclsvc_decode_##argt##args,	\

	.pc_encode	= (kxdrproc_t) nfsaclsvc_encode_##rest##res,	\

	.pc_release	= (kxdrproc_t) nfsaclsvc_release_##relt,	\

fs/nfsd/nfs3acl.c

+8 −7
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
 * NULL call.

 */

static __be32

nfsd3_proc_null(struct svc_rqst *rqstp, void *argp, void *resp)

nfsd3_proc_null(struct svc_rqst *rqstp)

{

	return nfs_ok;

}
@@ -26,9 +26,10 @@ nfsd3_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) 
/*

 * Get the Access and/or Default ACL of a file.

 */

static __be32 nfsd3_proc_getacl(struct svc_rqst * rqstp,

		struct nfsd3_getaclargs *argp, struct nfsd3_getaclres *resp)

static __be32 nfsd3_proc_getacl(struct svc_rqst *rqstp)

{

	struct nfsd3_getaclargs *argp = rqstp->rq_argp;

	struct nfsd3_getaclres *resp = rqstp->rq_resp;

	struct posix_acl *acl;

	struct inode *inode;

	svc_fh *fh;
@@ -80,10 +81,10 @@ static __be32 nfsd3_proc_getacl(struct svc_rqst * rqstp, 
/*

 * Set the Access and/or Default ACL of a file.

 */

static __be32 nfsd3_proc_setacl(struct svc_rqst * rqstp,

		struct nfsd3_setaclargs *argp,

		struct nfsd3_attrstat *resp)

static __be32 nfsd3_proc_setacl(struct svc_rqst *rqstp)

{

	struct nfsd3_setaclargs *argp = rqstp->rq_argp;

	struct nfsd3_attrstat *resp = rqstp->rq_resp;

	struct inode *inode;

	svc_fh *fh;

	__be32 nfserr = 0;
@@ -239,7 +240,7 @@ struct nfsd3_voidargs { int dummy; }; 


#define PROC(name, argt, rest, relt, cache, respsize)			\

{									\

	.pc_func	= (svc_procfunc) nfsd3_proc_##name,		\

	.pc_func	= nfsd3_proc_##name,				\

	.pc_decode	= (kxdrproc_t) nfs3svc_decode_##argt##args,	\

	.pc_encode	= (kxdrproc_t) nfs3svc_encode_##rest##res,	\

	.pc_release	= (kxdrproc_t) nfs3svc_release_##relt,		\