Skip to content

L
linux
Commit 1c8a5409 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Anna Schumaker
Browse files
Options

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 36ba89c2
Expand all Show whitespace changes
Inline Side-by-side
Showing with 328 additions and 227 deletions
fs/lockd/svc4proc.c
View file @ 1c8a5409
...@@ -62,7 +62,7 @@ nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp, ...@@ -62,7 +62,7 @@ nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp,
* NULL: Test for presence of service * NULL: Test for presence of service
*/ */
static __be32 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"); dprintk("lockd: NULL called\n");
return rpc_success; return rpc_success;
...@@ -72,9 +72,9 @@ nlm4svc_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) ...@@ -72,9 +72,9 @@ nlm4svc_proc_null(struct svc_rqst *rqstp, void *argp, void *resp)
* TEST: Check for conflicting lock * TEST: Check for conflicting lock
*/ */
static __be32 static __be32
nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp, __nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_res *resp)
struct nlm_res *resp)
{ {
struct nlm_args *argp = rqstp->rq_argp;
struct nlm_host *host; struct nlm_host *host;
struct nlm_file *file; struct nlm_file *file;
__be32 rc = rpc_success; __be32 rc = rpc_success;
...@@ -99,9 +99,15 @@ nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp, ...@@ -99,9 +99,15 @@ nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp,
} }
static __be32 static __be32
nlm4svc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp, nlm4svc_proc_test(struct svc_rqst *rqstp)
struct nlm_res *resp)
{ {
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_host *host;
struct nlm_file *file; struct nlm_file *file;
__be32 rc = rpc_success; __be32 rc = rpc_success;
...@@ -141,9 +147,15 @@ nlm4svc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp, ...@@ -141,9 +147,15 @@ nlm4svc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp,
} }
static __be32 static __be32
nlm4svc_proc_cancel(struct svc_rqst *rqstp, struct nlm_args *argp, nlm4svc_proc_lock(struct svc_rqst *rqstp)
struct nlm_res *resp) {
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_host *host;
struct nlm_file *file; struct nlm_file *file;
...@@ -170,13 +182,19 @@ nlm4svc_proc_cancel(struct svc_rqst *rqstp, struct nlm_args *argp, ...@@ -170,13 +182,19 @@ nlm4svc_proc_cancel(struct svc_rqst *rqstp, struct nlm_args *argp,
return rpc_success; return rpc_success;
} }
static __be32
nlm4svc_proc_cancel(struct svc_rqst *rqstp)
{
return __nlm4svc_proc_cancel(rqstp, rqstp->rq_resp);
}
/* /*
* UNLOCK: release a lock * UNLOCK: release a lock
*/ */
static __be32 static __be32
nlm4svc_proc_unlock(struct svc_rqst *rqstp, struct nlm_args *argp, __nlm4svc_proc_unlock(struct svc_rqst *rqstp, struct nlm_res *resp)
struct nlm_res *resp)
{ {
struct nlm_args *argp = rqstp->rq_argp;
struct nlm_host *host; struct nlm_host *host;
struct nlm_file *file; struct nlm_file *file;
...@@ -203,14 +221,21 @@ nlm4svc_proc_unlock(struct svc_rqst *rqstp, struct nlm_args *argp, ...@@ -203,14 +221,21 @@ nlm4svc_proc_unlock(struct svc_rqst *rqstp, struct nlm_args *argp,
return rpc_success; 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 * GRANTED: A server calls us to tell that a process' lock request
* was granted * was granted
*/ */
static __be32 static __be32
nlm4svc_proc_granted(struct svc_rqst *rqstp, struct nlm_args *argp, __nlm4svc_proc_granted(struct svc_rqst *rqstp, struct nlm_res *resp)
struct nlm_res *resp)
{ {
struct nlm_args *argp = rqstp->rq_argp;
resp->cookie = argp->cookie; resp->cookie = argp->cookie;
dprintk("lockd: GRANTED called\n"); dprintk("lockd: GRANTED called\n");
...@@ -219,6 +244,12 @@ nlm4svc_proc_granted(struct svc_rqst *rqstp, struct nlm_args *argp, ...@@ -219,6 +244,12 @@ nlm4svc_proc_granted(struct svc_rqst *rqstp, struct nlm_args *argp,
return rpc_success; 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 * This is the generic lockd callback for async RPC calls
*/ */
...@@ -243,9 +274,10 @@ static const struct rpc_call_ops nlm4svc_callback_ops = { ...@@ -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 * because we send the callback before the reply proper. I hope this
* doesn't break any clients. * doesn't break any clients.
*/ */
static __be32 nlm4svc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args *argp, static __be32 nlm4svc_callback(struct svc_rqst *rqstp, u32 proc,
__be32 (*func)(struct svc_rqst *, struct nlm_args *, struct nlm_res *)) __be32 (*func)(struct svc_rqst *, struct nlm_res *))
{ {
struct nlm_args *argp = rqstp->rq_argp;
struct nlm_host *host; struct nlm_host *host;
struct nlm_rqst *call; struct nlm_rqst *call;
__be32 stat; __be32 stat;
...@@ -261,7 +293,7 @@ static __be32 nlm4svc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args ...@@ -261,7 +293,7 @@ static __be32 nlm4svc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args
if (call == NULL) if (call == NULL)
return rpc_system_err; return rpc_system_err;
stat = func(rqstp, argp, &call->a_res); stat = func(rqstp, &call->a_res);
if (stat != 0) { if (stat != 0) {
nlmsvc_release_call(call); nlmsvc_release_call(call);
return stat; return stat;
...@@ -273,48 +305,44 @@ static __be32 nlm4svc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args ...@@ -273,48 +305,44 @@ static __be32 nlm4svc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args
return rpc_success; return rpc_success;
} }
static __be32 nlm4svc_proc_test_msg(struct svc_rqst *rqstp, struct nlm_args *argp, static __be32 nlm4svc_proc_test_msg(struct svc_rqst *rqstp)
void *resp)
{ {
dprintk("lockd: TEST_MSG called\n"); 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, static __be32 nlm4svc_proc_lock_msg(struct svc_rqst *rqstp)
void *resp)
{ {
dprintk("lockd: LOCK_MSG called\n"); 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, static __be32 nlm4svc_proc_cancel_msg(struct svc_rqst *rqstp)
void *resp)
{ {
dprintk("lockd: CANCEL_MSG called\n"); 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, static __be32 nlm4svc_proc_unlock_msg(struct svc_rqst *rqstp)
void *resp)
{ {
dprintk("lockd: UNLOCK_MSG called\n"); 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, static __be32 nlm4svc_proc_granted_msg(struct svc_rqst *rqstp)
void *resp)
{ {
dprintk("lockd: GRANTED_MSG called\n"); 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. * SHARE: create a DOS share or alter existing share.
*/ */
static __be32 static __be32
nlm4svc_proc_share(struct svc_rqst *rqstp, struct nlm_args *argp, nlm4svc_proc_share(struct svc_rqst *rqstp)
struct nlm_res *resp)
{ {
struct nlm_args *argp = rqstp->rq_argp;
struct nlm_res *resp = rqstp->rq_resp;
struct nlm_host *host; struct nlm_host *host;
struct nlm_file *file; struct nlm_file *file;
...@@ -345,9 +373,10 @@ nlm4svc_proc_share(struct svc_rqst *rqstp, struct nlm_args *argp, ...@@ -345,9 +373,10 @@ nlm4svc_proc_share(struct svc_rqst *rqstp, struct nlm_args *argp,
* UNSHARE: Release a DOS share. * UNSHARE: Release a DOS share.
*/ */
static __be32 static __be32
nlm4svc_proc_unshare(struct svc_rqst *rqstp, struct nlm_args *argp, nlm4svc_proc_unshare(struct svc_rqst *rqstp)
struct nlm_res *resp)
{ {
struct nlm_args *argp = rqstp->rq_argp;
struct nlm_res *resp = rqstp->rq_resp;
struct nlm_host *host; struct nlm_host *host;
struct nlm_file *file; struct nlm_file *file;
...@@ -378,22 +407,23 @@ nlm4svc_proc_unshare(struct svc_rqst *rqstp, struct nlm_args *argp, ...@@ -378,22 +407,23 @@ nlm4svc_proc_unshare(struct svc_rqst *rqstp, struct nlm_args *argp,
* NM_LOCK: Create an unmonitored lock * NM_LOCK: Create an unmonitored lock
*/ */
static __be32 static __be32
nlm4svc_proc_nm_lock(struct svc_rqst *rqstp, struct nlm_args *argp, nlm4svc_proc_nm_lock(struct svc_rqst *rqstp)
struct nlm_res *resp)
{ {
struct nlm_args *argp = rqstp->rq_argp;
dprintk("lockd: NM_LOCK called\n"); dprintk("lockd: NM_LOCK called\n");
argp->monitor = 0; /* just clean the monitor flag */ 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 * FREE_ALL: Release all locks and shares held by client
*/ */
static __be32 static __be32
nlm4svc_proc_free_all(struct svc_rqst *rqstp, struct nlm_args *argp, nlm4svc_proc_free_all(struct svc_rqst *rqstp)
void *resp)
{ {
struct nlm_args *argp = rqstp->rq_argp;
struct nlm_host *host; struct nlm_host *host;
/* Obtain client */ /* Obtain client */
...@@ -409,9 +439,10 @@ nlm4svc_proc_free_all(struct svc_rqst *rqstp, struct nlm_args *argp, ...@@ -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) * SM_NOTIFY: private callback from statd (not part of official NLM proto)
*/ */
static __be32 static __be32
nlm4svc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp, nlm4svc_proc_sm_notify(struct svc_rqst *rqstp)
void *resp)
{ {
struct nlm_reboot *argp = rqstp->rq_argp;
dprintk("lockd: SM_NOTIFY called\n"); dprintk("lockd: SM_NOTIFY called\n");
if (!nlm_privileged_requester(rqstp)) { if (!nlm_privileged_requester(rqstp)) {
...@@ -429,9 +460,10 @@ nlm4svc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp, ...@@ -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 * client sent a GRANTED_RES, let's remove the associated block
*/ */
static __be32 static __be32
nlm4svc_proc_granted_res(struct svc_rqst *rqstp, struct nlm_res *argp, nlm4svc_proc_granted_res(struct svc_rqst *rqstp)
void *resp)
{ {
struct nlm_res *argp = rqstp->rq_argp;
if (!nlmsvc_ops) if (!nlmsvc_ops)
return rpc_success; return rpc_success;
...@@ -463,7 +495,7 @@ nlm4svc_proc_granted_res(struct svc_rqst *rqstp, struct nlm_res *argp, ...@@ -463,7 +495,7 @@ nlm4svc_proc_granted_res(struct svc_rqst *rqstp, struct nlm_res *argp,
struct nlm_void { int dummy; }; struct nlm_void { int dummy; };
#define PROC(name, xargt, xrest, argt, rest, respsize) \ #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_decode = (kxdrproc_t) nlm4svc_decode_##xargt, \
.pc_encode = (kxdrproc_t) nlm4svc_encode_##xrest, \ .pc_encode = (kxdrproc_t) nlm4svc_encode_##xrest, \
.pc_release = NULL, \ .pc_release = NULL, \
......
fs/lockd/svcproc.c
View file @ 1c8a5409
...@@ -92,7 +92,7 @@ nlmsvc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp, ...@@ -92,7 +92,7 @@ nlmsvc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp,
* NULL: Test for presence of service * NULL: Test for presence of service
*/ */
static __be32 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"); dprintk("lockd: NULL called\n");
return rpc_success; return rpc_success;
...@@ -102,9 +102,9 @@ nlmsvc_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) ...@@ -102,9 +102,9 @@ nlmsvc_proc_null(struct svc_rqst *rqstp, void *argp, void *resp)
* TEST: Check for conflicting lock * TEST: Check for conflicting lock
*/ */
static __be32 static __be32
nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp, __nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_res *resp)
struct nlm_res *resp)
{ {
struct nlm_args *argp = rqstp->rq_argp;
struct nlm_host *host; struct nlm_host *host;
struct nlm_file *file; struct nlm_file *file;
__be32 rc = rpc_success; __be32 rc = rpc_success;
...@@ -130,9 +130,15 @@ nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp, ...@@ -130,9 +130,15 @@ nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp,
} }
static __be32 static __be32
nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp, nlmsvc_proc_test(struct svc_rqst *rqstp)
struct nlm_res *resp)
{ {
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_host *host;
struct nlm_file *file; struct nlm_file *file;
__be32 rc = rpc_success; __be32 rc = rpc_success;
...@@ -172,9 +178,15 @@ nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp, ...@@ -172,9 +178,15 @@ nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp,
} }
static __be32 static __be32
nlmsvc_proc_cancel(struct svc_rqst *rqstp, struct nlm_args *argp, nlmsvc_proc_lock(struct svc_rqst *rqstp)
struct nlm_res *resp) {
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_host *host;
struct nlm_file *file; struct nlm_file *file;
struct net *net = SVC_NET(rqstp); struct net *net = SVC_NET(rqstp);
...@@ -202,13 +214,19 @@ nlmsvc_proc_cancel(struct svc_rqst *rqstp, struct nlm_args *argp, ...@@ -202,13 +214,19 @@ nlmsvc_proc_cancel(struct svc_rqst *rqstp, struct nlm_args *argp,
return rpc_success; return rpc_success;
} }
static __be32
nlmsvc_proc_cancel(struct svc_rqst *rqstp)
{
return __nlmsvc_proc_cancel(rqstp, rqstp->rq_resp);
}
/* /*
* UNLOCK: release a lock * UNLOCK: release a lock
*/ */
static __be32 static __be32
nlmsvc_proc_unlock(struct svc_rqst *rqstp, struct nlm_args *argp, __nlmsvc_proc_unlock(struct svc_rqst *rqstp, struct nlm_res *resp)
struct nlm_res *resp)
{ {
struct nlm_args *argp = rqstp->rq_argp;
struct nlm_host *host; struct nlm_host *host;
struct nlm_file *file; struct nlm_file *file;
struct net *net = SVC_NET(rqstp); struct net *net = SVC_NET(rqstp);
...@@ -236,14 +254,21 @@ nlmsvc_proc_unlock(struct svc_rqst *rqstp, struct nlm_args *argp, ...@@ -236,14 +254,21 @@ nlmsvc_proc_unlock(struct svc_rqst *rqstp, struct nlm_args *argp,
return rpc_success; 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 * GRANTED: A server calls us to tell that a process' lock request
* was granted * was granted
*/ */
static __be32 static __be32
nlmsvc_proc_granted(struct svc_rqst *rqstp, struct nlm_args *argp, __nlmsvc_proc_granted(struct svc_rqst *rqstp, struct nlm_res *resp)
struct nlm_res *resp)
{ {
struct nlm_args *argp = rqstp->rq_argp;
resp->cookie = argp->cookie; resp->cookie = argp->cookie;
dprintk("lockd: GRANTED called\n"); dprintk("lockd: GRANTED called\n");
...@@ -252,6 +277,12 @@ nlmsvc_proc_granted(struct svc_rqst *rqstp, struct nlm_args *argp, ...@@ -252,6 +277,12 @@ nlmsvc_proc_granted(struct svc_rqst *rqstp, struct nlm_args *argp,
return rpc_success; 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 * This is the generic lockd callback for async RPC calls
*/ */
...@@ -284,9 +315,10 @@ static const struct rpc_call_ops nlmsvc_callback_ops = { ...@@ -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 * because we send the callback before the reply proper. I hope this
* doesn't break any clients. * doesn't break any clients.
*/ */
static __be32 nlmsvc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args *argp, static __be32 nlmsvc_callback(struct svc_rqst *rqstp, u32 proc,
__be32 (*func)(struct svc_rqst *, struct nlm_args *, struct nlm_res *)) __be32 (*func)(struct svc_rqst *, struct nlm_res *))
{ {
struct nlm_args *argp = rqstp->rq_argp;
struct nlm_host *host; struct nlm_host *host;
struct nlm_rqst *call; struct nlm_rqst *call;
__be32 stat; __be32 stat;
...@@ -302,7 +334,7 @@ static __be32 nlmsvc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args ...@@ -302,7 +334,7 @@ static __be32 nlmsvc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args
if (call == NULL) if (call == NULL)
return rpc_system_err; return rpc_system_err;
stat = func(rqstp, argp, &call->a_res); stat = func(rqstp, &call->a_res);
if (stat != 0) { if (stat != 0) {
nlmsvc_release_call(call); nlmsvc_release_call(call);
return stat; return stat;
...@@ -314,50 +346,46 @@ static __be32 nlmsvc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args ...@@ -314,50 +346,46 @@ static __be32 nlmsvc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args
return rpc_success; return rpc_success;
} }
static __be32 nlmsvc_proc_test_msg(struct svc_rqst *rqstp, struct nlm_args *argp, static __be32 nlmsvc_proc_test_msg(struct svc_rqst *rqstp)
void *resp)
{ {
dprintk("lockd: TEST_MSG called\n"); 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, static __be32 nlmsvc_proc_lock_msg(struct svc_rqst *rqstp)
void *resp)
{ {
dprintk("lockd: LOCK_MSG called\n"); 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, static __be32 nlmsvc_proc_cancel_msg(struct svc_rqst *rqstp)
void *resp)
{ {
dprintk("lockd: CANCEL_MSG called\n"); 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 static __be32
nlmsvc_proc_unlock_msg(struct svc_rqst *rqstp, struct nlm_args *argp, nlmsvc_proc_unlock_msg(struct svc_rqst *rqstp)
void *resp)
{ {
dprintk("lockd: UNLOCK_MSG called\n"); 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 static __be32
nlmsvc_proc_granted_msg(struct svc_rqst *rqstp, struct nlm_args *argp, nlmsvc_proc_granted_msg(struct svc_rqst *rqstp)
void *resp)
{ {
dprintk("lockd: GRANTED_MSG called\n"); 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. * SHARE: create a DOS share or alter existing share.
*/ */
static __be32 static __be32
nlmsvc_proc_share(struct svc_rqst *rqstp, struct nlm_args *argp, nlmsvc_proc_share(struct svc_rqst *rqstp)
struct nlm_res *resp)
{ {
struct nlm_args *argp = rqstp->rq_argp;
struct nlm_res *resp = rqstp->rq_resp;
struct nlm_host *host; struct nlm_host *host;
struct nlm_file *file; struct nlm_file *file;
...@@ -388,9 +416,10 @@ nlmsvc_proc_share(struct svc_rqst *rqstp, struct nlm_args *argp, ...@@ -388,9 +416,10 @@ nlmsvc_proc_share(struct svc_rqst *rqstp, struct nlm_args *argp,
* UNSHARE: Release a DOS share. * UNSHARE: Release a DOS share.
*/ */
static __be32 static __be32
nlmsvc_proc_unshare(struct svc_rqst *rqstp, struct nlm_args *argp, nlmsvc_proc_unshare(struct svc_rqst *rqstp)
struct nlm_res *resp)
{ {
struct nlm_args *argp = rqstp->rq_argp;
struct nlm_res *resp = rqstp->rq_resp;
struct nlm_host *host; struct nlm_host *host;
struct nlm_file *file; struct nlm_file *file;
...@@ -421,22 +450,23 @@ nlmsvc_proc_unshare(struct svc_rqst *rqstp, struct nlm_args *argp, ...@@ -421,22 +450,23 @@ nlmsvc_proc_unshare(struct svc_rqst *rqstp, struct nlm_args *argp,
* NM_LOCK: Create an unmonitored lock * NM_LOCK: Create an unmonitored lock
*/ */
static __be32 static __be32
nlmsvc_proc_nm_lock(struct svc_rqst *rqstp, struct nlm_args *argp, nlmsvc_proc_nm_lock(struct svc_rqst *rqstp)
struct nlm_res *resp)
{ {
struct nlm_args *argp = rqstp->rq_argp;
dprintk("lockd: NM_LOCK called\n"); dprintk("lockd: NM_LOCK called\n");
argp->monitor = 0; /* just clean the monitor flag */ 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 * FREE_ALL: Release all locks and shares held by client
*/ */
static __be32 static __be32
nlmsvc_proc_free_all(struct svc_rqst *rqstp, struct nlm_args *argp, nlmsvc_proc_free_all(struct svc_rqst *rqstp)
void *resp)
{ {
struct nlm_args *argp = rqstp->rq_argp;
struct nlm_host *host; struct nlm_host *host;
/* Obtain client */ /* Obtain client */
...@@ -452,9 +482,10 @@ nlmsvc_proc_free_all(struct svc_rqst *rqstp, struct nlm_args *argp, ...@@ -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) * SM_NOTIFY: private callback from statd (not part of official NLM proto)
*/ */
static __be32 static __be32
nlmsvc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp, nlmsvc_proc_sm_notify(struct svc_rqst *rqstp)
void *resp)
{ {
struct nlm_reboot *argp = rqstp->rq_argp;
dprintk("lockd: SM_NOTIFY called\n"); dprintk("lockd: SM_NOTIFY called\n");
if (!nlm_privileged_requester(rqstp)) { if (!nlm_privileged_requester(rqstp)) {
...@@ -472,9 +503,10 @@ nlmsvc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp, ...@@ -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 * client sent a GRANTED_RES, let's remove the associated block
*/ */
static __be32 static __be32
nlmsvc_proc_granted_res(struct svc_rqst *rqstp, struct nlm_res *argp, nlmsvc_proc_granted_res(struct svc_rqst *rqstp)
void *resp)
{ {
struct nlm_res *argp = rqstp->rq_argp;
if (!nlmsvc_ops) if (!nlmsvc_ops)
return rpc_success; return rpc_success;
...@@ -505,7 +537,7 @@ nlmsvc_proc_granted_res(struct svc_rqst *rqstp, struct nlm_res *argp, ...@@ -505,7 +537,7 @@ nlmsvc_proc_granted_res(struct svc_rqst *rqstp, struct nlm_res *argp,
struct nlm_void { int dummy; }; struct nlm_void { int dummy; };
#define PROC(name, xargt, xrest, argt, rest, respsize) \ #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_decode = (kxdrproc_t) nlmsvc_decode_##xargt, \
.pc_encode = (kxdrproc_t) nlmsvc_encode_##xrest, \ .pc_encode = (kxdrproc_t) nlmsvc_encode_##xrest, \
.pc_release = NULL, \ .pc_release = NULL, \
......
fs/nfs/callback_xdr.c
View file @ 1c8a5409
...@@ -53,7 +53,7 @@ struct callback_op { ...@@ -53,7 +53,7 @@ struct callback_op {
static struct callback_op callback_ops[]; 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); return htonl(NFS4_OK);
} }
...@@ -880,7 +880,7 @@ static __be32 process_op(int nop, struct svc_rqst *rqstp, ...@@ -880,7 +880,7 @@ static __be32 process_op(int nop, struct svc_rqst *rqstp,
/* /*
* Decode, process and encode a COMPOUND * 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_arg hdr_arg = { 0 };
struct cb_compound_hdr_res hdr_res = { NULL }; 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 ...@@ -916,7 +916,8 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp, void *argp, void *r
while (status == 0 && nops != hdr_arg.nops) { while (status == 0 && nops != hdr_arg.nops) {
status = process_op(nops, rqstp, &xdr_in, status = process_op(nops, rqstp, &xdr_in,
argp, &xdr_out, resp, &cps); rqstp->rq_argp, &xdr_out, rqstp->rq_resp,
&cps);
nops++; nops++;
} }
......
fs/nfsd/nfs2acl.c
View file @ 1c8a5409
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
* NULL call. * NULL call.
*/ */
static __be32 static __be32
nfsacld_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) nfsacld_proc_null(struct svc_rqst *rqstp)
{ {
return nfs_ok; return nfs_ok;
} }
...@@ -27,9 +27,10 @@ nfsacld_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) ...@@ -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. * Get the Access and/or Default ACL of a file.
*/ */
static __be32 nfsacld_proc_getacl(struct svc_rqst * rqstp, static __be32 nfsacld_proc_getacl(struct svc_rqst *rqstp)
struct nfsd3_getaclargs *argp, struct nfsd3_getaclres *resp)
{ {
struct nfsd3_getaclargs *argp = rqstp->rq_argp;
struct nfsd3_getaclres *resp = rqstp->rq_resp;
struct posix_acl *acl; struct posix_acl *acl;
struct inode *inode; struct inode *inode;
svc_fh *fh; svc_fh *fh;
...@@ -87,10 +88,10 @@ static __be32 nfsacld_proc_getacl(struct svc_rqst * rqstp, ...@@ -87,10 +88,10 @@ static __be32 nfsacld_proc_getacl(struct svc_rqst * rqstp,
/* /*
* Set the Access and/or Default ACL of a file. * Set the Access and/or Default ACL of a file.
*/ */
static __be32 nfsacld_proc_setacl(struct svc_rqst * rqstp, static __be32 nfsacld_proc_setacl(struct svc_rqst *rqstp)
struct nfsd3_setaclargs *argp,
struct nfsd_attrstat *resp)
{ {
struct nfsd3_setaclargs *argp = rqstp->rq_argp;
struct nfsd_attrstat *resp = rqstp->rq_resp;
struct inode *inode; struct inode *inode;
svc_fh *fh; svc_fh *fh;
__be32 nfserr = 0; __be32 nfserr = 0;
...@@ -141,9 +142,10 @@ static __be32 nfsacld_proc_setacl(struct svc_rqst * rqstp, ...@@ -141,9 +142,10 @@ static __be32 nfsacld_proc_setacl(struct svc_rqst * rqstp,
/* /*
* Check file attributes * Check file attributes
*/ */
static __be32 nfsacld_proc_getattr(struct svc_rqst * rqstp, static __be32 nfsacld_proc_getattr(struct svc_rqst *rqstp)
struct nfsd_fhandle *argp, struct nfsd_attrstat *resp)
{ {
struct nfsd_fhandle *argp = rqstp->rq_argp;
struct nfsd_attrstat *resp = rqstp->rq_resp;
__be32 nfserr; __be32 nfserr;
dprintk("nfsd: GETATTR %s\n", SVCFH_fmt(&argp->fh)); dprintk("nfsd: GETATTR %s\n", SVCFH_fmt(&argp->fh));
...@@ -158,9 +160,10 @@ static __be32 nfsacld_proc_getattr(struct svc_rqst * rqstp, ...@@ -158,9 +160,10 @@ static __be32 nfsacld_proc_getattr(struct svc_rqst * rqstp,
/* /*
* Check file access * Check file access
*/ */
static __be32 nfsacld_proc_access(struct svc_rqst *rqstp, struct nfsd3_accessargs *argp, static __be32 nfsacld_proc_access(struct svc_rqst *rqstp)
struct nfsd3_accessres *resp)
{ {
struct nfsd3_accessargs *argp = rqstp->rq_argp;
struct nfsd3_accessres *resp = rqstp->rq_resp;
__be32 nfserr; __be32 nfserr;
dprintk("nfsd: ACCESS(2acl) %s 0x%x\n", dprintk("nfsd: ACCESS(2acl) %s 0x%x\n",
...@@ -347,7 +350,7 @@ struct nfsd3_voidargs { int dummy; }; ...@@ -347,7 +350,7 @@ struct nfsd3_voidargs { int dummy; };
#define PROC(name, argt, rest, relt, cache, respsize) \ #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_decode = (kxdrproc_t) nfsaclsvc_decode_##argt##args, \
.pc_encode = (kxdrproc_t) nfsaclsvc_encode_##rest##res, \ .pc_encode = (kxdrproc_t) nfsaclsvc_encode_##rest##res, \
.pc_release = (kxdrproc_t) nfsaclsvc_release_##relt, \ .pc_release = (kxdrproc_t) nfsaclsvc_release_##relt, \
......
fs/nfsd/nfs3acl.c
View file @ 1c8a5409
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
* NULL call. * NULL call.
*/ */
static __be32 static __be32
nfsd3_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) nfsd3_proc_null(struct svc_rqst *rqstp)
{ {
return nfs_ok; return nfs_ok;
} }
...@@ -26,9 +26,10 @@ nfsd3_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) ...@@ -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. * Get the Access and/or Default ACL of a file.
*/ */
static __be32 nfsd3_proc_getacl(struct svc_rqst * rqstp, static __be32 nfsd3_proc_getacl(struct svc_rqst *rqstp)
struct nfsd3_getaclargs *argp, struct nfsd3_getaclres *resp)
{ {
struct nfsd3_getaclargs *argp = rqstp->rq_argp;
struct nfsd3_getaclres *resp = rqstp->rq_resp;
struct posix_acl *acl; struct posix_acl *acl;
struct inode *inode; struct inode *inode;
svc_fh *fh; svc_fh *fh;
...@@ -80,10 +81,10 @@ static __be32 nfsd3_proc_getacl(struct svc_rqst * rqstp, ...@@ -80,10 +81,10 @@ static __be32 nfsd3_proc_getacl(struct svc_rqst * rqstp,
/* /*
* Set the Access and/or Default ACL of a file. * Set the Access and/or Default ACL of a file.
*/ */
static __be32 nfsd3_proc_setacl(struct svc_rqst * rqstp, static __be32 nfsd3_proc_setacl(struct svc_rqst *rqstp)
struct nfsd3_setaclargs *argp,
struct nfsd3_attrstat *resp)
{ {
struct nfsd3_setaclargs *argp = rqstp->rq_argp;
struct nfsd3_attrstat *resp = rqstp->rq_resp;
struct inode *inode; struct inode *inode;
svc_fh *fh; svc_fh *fh;
__be32 nfserr = 0; __be32 nfserr = 0;
...@@ -239,7 +240,7 @@ struct nfsd3_voidargs { int dummy; }; ...@@ -239,7 +240,7 @@ struct nfsd3_voidargs { int dummy; };
#define PROC(name, argt, rest, relt, cache, respsize) \ #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_decode = (kxdrproc_t) nfs3svc_decode_##argt##args, \
.pc_encode = (kxdrproc_t) nfs3svc_encode_##rest##res, \ .pc_encode = (kxdrproc_t) nfs3svc_encode_##rest##res, \
.pc_release = (kxdrproc_t) nfs3svc_release_##relt, \ .pc_release = (kxdrproc_t) nfs3svc_release_##relt, \
......
fs/nfsd/nfs3proc.c
View file @ 1c8a5409
This diff is collapsed.
fs/nfsd/nfs4proc.c
View file @ 1c8a5409
...@@ -1510,7 +1510,7 @@ nfsd4_layoutreturn(struct svc_rqst *rqstp, ...@@ -1510,7 +1510,7 @@ nfsd4_layoutreturn(struct svc_rqst *rqstp,
* NULL call. * NULL call.
*/ */
static __be32 static __be32
nfsd4_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) nfsd4_proc_null(struct svc_rqst *rqstp)
{ {
return nfs_ok; return nfs_ok;
} }
...@@ -1524,6 +1524,7 @@ static inline void nfsd4_increment_op_stats(u32 opnum) ...@@ -1524,6 +1524,7 @@ static inline void nfsd4_increment_op_stats(u32 opnum)
typedef __be32(*nfsd4op_func)(struct svc_rqst *, struct nfsd4_compound_state *, typedef __be32(*nfsd4op_func)(struct svc_rqst *, struct nfsd4_compound_state *,
void *); void *);
typedef u32(*nfsd4op_rsize)(struct svc_rqst *, struct nfsd4_op *op); typedef u32(*nfsd4op_rsize)(struct svc_rqst *, struct nfsd4_op *op);
typedef void(*stateid_setter)(struct nfsd4_compound_state *, void *); typedef void(*stateid_setter)(struct nfsd4_compound_state *, void *);
typedef void(*stateid_getter)(struct nfsd4_compound_state *, void *); typedef void(*stateid_getter)(struct nfsd4_compound_state *, void *);
...@@ -1673,10 +1674,10 @@ static void svcxdr_init_encode(struct svc_rqst *rqstp, ...@@ -1673,10 +1674,10 @@ static void svcxdr_init_encode(struct svc_rqst *rqstp,
* COMPOUND call. * COMPOUND call.
*/ */
static __be32 static __be32
nfsd4_proc_compound(struct svc_rqst *rqstp, void *arg, void *res) nfsd4_proc_compound(struct svc_rqst *rqstp)
{ {
struct nfsd4_compoundargs *args = arg; struct nfsd4_compoundargs *args = rqstp->rq_argp;
struct nfsd4_compoundres *resp = res; struct nfsd4_compoundres *resp = rqstp->rq_resp;
struct nfsd4_op *op; struct nfsd4_op *op;
struct nfsd4_operation *opdesc; struct nfsd4_operation *opdesc;
struct nfsd4_compound_state *cstate = &resp->cstate; struct nfsd4_compound_state *cstate = &resp->cstate;
......
fs/nfsd/nfsproc.c
View file @ 1c8a5409
This diff is collapsed.
fs/nfsd/nfssvc.c
View file @ 1c8a5409
...@@ -827,7 +827,7 @@ nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp) ...@@ -827,7 +827,7 @@ nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp)
rqstp->rq_res.head[0].iov_len += sizeof(__be32); rqstp->rq_res.head[0].iov_len += sizeof(__be32);
/* Now call the procedure handler, and encode NFS status. */ /* Now call the procedure handler, and encode NFS status. */
nfserr = proc->pc_func(rqstp, rqstp->rq_argp, rqstp->rq_resp); nfserr = proc->pc_func(rqstp);
nfserr = map_new_errors(rqstp->rq_vers, nfserr); nfserr = map_new_errors(rqstp->rq_vers, nfserr);
if (nfserr == nfserr_dropit || test_bit(RQ_DROPME, &rqstp->rq_flags)) { if (nfserr == nfserr_dropit || test_bit(RQ_DROPME, &rqstp->rq_flags)) {
dprintk("nfsd: Dropping request; may be revisited later\n"); dprintk("nfsd: Dropping request; may be revisited later\n");
......
include/linux/sunrpc/svc.h
View file @ 1c8a5409
...@@ -419,9 +419,9 @@ struct svc_version { ...@@ -419,9 +419,9 @@ struct svc_version {
/* /*
* RPC procedure info * RPC procedure info
*/ */
typedef __be32 (*svc_procfunc)(struct svc_rqst *, void *argp, void *resp);
struct svc_procedure { struct svc_procedure {
svc_procfunc pc_func; /* process the request */ /* process the request: */
__be32 (*pc_func)(struct svc_rqst *);
kxdrproc_t pc_decode; /* XDR decode args */ kxdrproc_t pc_decode; /* XDR decode args */
kxdrproc_t pc_encode; /* XDR encode result */ kxdrproc_t pc_encode; /* XDR encode result */
kxdrproc_t pc_release; /* XDR free result */ kxdrproc_t pc_release; /* XDR free result */
......
net/sunrpc/svc.c
View file @ 1c8a5409
...@@ -1281,7 +1281,7 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv) ...@@ -1281,7 +1281,7 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv)
if (xdr && !xdr(rqstp, argv->iov_base, rqstp->rq_argp)) if (xdr && !xdr(rqstp, argv->iov_base, rqstp->rq_argp))
goto err_garbage; goto err_garbage;
*statp = procp->pc_func(rqstp, rqstp->rq_argp, rqstp->rq_resp); *statp = procp->pc_func(rqstp);
/* Encode reply */ /* Encode reply */
if (*statp == rpc_drop_reply || if (*statp == rpc_drop_reply ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7