From 417e8c7c7f421fc282fa317bdf3d42470d6317a4 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Fri, 2 Feb 2007 15:37:43 -0800 Subject: [PATCH] --- yaml --- r: 46067 b: refs/heads/master c: a995e9eb3258df6ab2e9f958e08003978e50d568 h: refs/heads/master i: 46065: dad92ac1f55aad41a904d3522a055028ae712e59 46063: 5bbf7032ce963b048ae349dbbb335bd654b2c24f v: v3 --- [refs] | 2 +- trunk/fs/lockd/clntproc.c | 9 +++------ trunk/fs/lockd/svclock.c | 4 +--- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 03bc7bc744b4..216c336fdf5f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce35a81a71f405031ed6fd0d454d3aaa55dc8ed2 +refs/heads/master: a995e9eb3258df6ab2e9f958e08003978e50d568 diff --git a/trunk/fs/lockd/clntproc.c b/trunk/fs/lockd/clntproc.c index 0b4acc1c5e7d..a5c019e1a447 100644 --- a/trunk/fs/lockd/clntproc.c +++ b/trunk/fs/lockd/clntproc.c @@ -361,7 +361,6 @@ static int __nlm_async_call(struct nlm_rqst *req, u32 proc, struct rpc_message * { struct nlm_host *host = req->a_host; struct rpc_clnt *clnt; - int status = -ENOLCK; dprintk("lockd: call procedure %d on %s (async)\n", (int)proc, host->h_name); @@ -373,12 +372,10 @@ static int __nlm_async_call(struct nlm_rqst *req, u32 proc, struct rpc_message * msg->rpc_proc = &clnt->cl_procinfo[proc]; /* bootstrap and kick off the async RPC call */ - status = rpc_call_async(clnt, msg, RPC_TASK_ASYNC, tk_ops, req); - if (status == 0) - return 0; + return rpc_call_async(clnt, msg, RPC_TASK_ASYNC, tk_ops, req); out_err: - nlm_release_call(req); - return status; + tk_ops->rpc_release(req); + return -ENOLCK; } int nlm_async_call(struct nlm_rqst *req, u32 proc, const struct rpc_call_ops *tk_ops) diff --git a/trunk/fs/lockd/svclock.c b/trunk/fs/lockd/svclock.c index c7db0a5bccdc..cf51f849e76c 100644 --- a/trunk/fs/lockd/svclock.c +++ b/trunk/fs/lockd/svclock.c @@ -593,9 +593,7 @@ nlmsvc_grant_blocked(struct nlm_block *block) /* Call the client */ kref_get(&block->b_count); - if (nlm_async_call(block->b_call, NLMPROC_GRANTED_MSG, - &nlmsvc_grant_ops) < 0) - nlmsvc_release_block(block); + nlm_async_call(block->b_call, NLMPROC_GRANTED_MSG, &nlmsvc_grant_ops); } /*