summaryrefslogtreecommitdiffstats
path: root/fs/lockd
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2007-06-14 22:40:31 +0200
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-07-11 05:40:28 +0200
commit34f52e3591f241b825353ba27def956d8487c400 (patch)
tree9f7f0cd52f206095217bd2469e31c2531cbae0a4 /fs/lockd
parentSUNRPC: Clean up tk_pid allocation and make it lockless (diff)
downloadlinux-34f52e3591f241b825353ba27def956d8487c400.tar.xz
linux-34f52e3591f241b825353ba27def956d8487c400.zip
SUNRPC: Convert rpc_clnt->cl_users to a kref
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/lockd')
-rw-r--r--fs/lockd/host.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index 96070bff93fc..c252a1c95857 100644
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -161,15 +161,9 @@ nlm_destroy_host(struct nlm_host *host)
*/
nsm_unmonitor(host);
- if ((clnt = host->h_rpcclnt) != NULL) {
- if (atomic_read(&clnt->cl_users)) {
- printk(KERN_WARNING
- "lockd: active RPC handle\n");
- clnt->cl_dead = 1;
- } else {
- rpc_destroy_client(host->h_rpcclnt);
- }
- }
+ clnt = host->h_rpcclnt;
+ if (clnt != NULL)
+ rpc_shutdown_client(clnt);
kfree(host);
}