summaryrefslogtreecommitdiffstats
path: root/fs/lockd/svcproc.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2006-03-20 19:44:45 +0100
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-03-20 19:44:45 +0100
commit92737230dd3f1478033819d4bc20339f8da852da (patch)
tree27bc7804a077a29b7614c698bb02632dc4ce228e /fs/lockd/svcproc.c
parentNLM: Fix nlmclnt_test to not copy private part of locks (diff)
downloadlinux-92737230dd3f1478033819d4bc20339f8da852da.tar.xz
linux-92737230dd3f1478033819d4bc20339f8da852da.zip
NLM: Add nlmclnt_release_call
Add a helper function to simplify the freeing of NLM client requests. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/lockd/svcproc.c')
-rw-r--r--fs/lockd/svcproc.c33
1 files changed, 13 insertions, 20 deletions
diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c
index 4986fbe44540..956d1d71e2af 100644
--- a/fs/lockd/svcproc.c
+++ b/fs/lockd/svcproc.c
@@ -505,43 +505,36 @@ nlmsvc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_res *resp)
struct nlm_host *host;
struct nlm_rqst *call;
- if (!(call = nlmclnt_alloc_call()))
+ host = nlmsvc_lookup_host(rqstp);
+ if (host == NULL)
return rpc_system_err;
- host = nlmsvc_lookup_host(rqstp);
- if (!host) {
- kfree(call);
+ call = nlm_alloc_call(host);
+ if (call == NULL)
return rpc_system_err;
- }
call->a_flags = RPC_TASK_ASYNC;
- call->a_host = host;
memcpy(&call->a_args, resp, sizeof(*resp));
- if (nlmsvc_async_call(call, proc, &nlmsvc_callback_ops) < 0)
- goto error;
-
+ if (nlm_async_call(call, proc, &nlmsvc_callback_ops) < 0)
+ return rpc_system_err;
return rpc_success;
- error:
- nlm_release_host(host);
- kfree(call);
- return rpc_system_err;
}
static void nlmsvc_callback_exit(struct rpc_task *task, void *data)
{
- struct nlm_rqst *call = data;
+ dprintk("lockd: %4d callback returned %d\n", task->tk_pid,
+ -task->tk_status);
+}
- if (task->tk_status < 0) {
- dprintk("lockd: %4d callback failed (errno = %d)\n",
- task->tk_pid, -task->tk_status);
- }
- nlm_release_host(call->a_host);
- kfree(call);
+static void nlmsvc_callback_release(void *data)
+{
+ nlm_release_call(data);
}
static const struct rpc_call_ops nlmsvc_callback_ops = {
.rpc_call_done = nlmsvc_callback_exit,
+ .rpc_release = nlmsvc_callback_release,
};
/*