1 files changed, 19 insertions, 12 deletions

diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index 82f7a0b1d8ae..729ac427d359 100644
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -16,6 +16,7 @@
 #include <linux/sunrpc/svc.h>
 #include <linux/lockd/lockd.h>
 #include <linux/lockd/sm_inter.h>
+#include <linux/mutex.h>
 
 
 #define NLMDBG_FACILITY         NLMDBG_HOSTCACHE
@@ -30,7 +31,7 @@
 static struct nlm_host *        nlm_hosts[NLM_HOST_NRHASH];
 static unsigned long            next_gc;
 static int                      nrhosts;
-static DECLARE_MUTEX(nlm_host_sema);
+static DEFINE_MUTEX(nlm_host_mutex);
 
 
 static void                     nlm_gc_hosts(void);
@@ -71,7 +72,7 @@ nlm_lookup_host(int server, struct sockaddr_in *sin,
         hash = NLM_ADDRHASH(sin->sin_addr.s_addr);
 
         /* Lock hash table */
-        down(&nlm_host_sema);
+        mutex_lock(&nlm_host_mutex);
 
         if (time_after_eq(jiffies, next_gc))
                 nlm_gc_hosts();
@@ -91,7 +92,7 @@ nlm_lookup_host(int server, struct sockaddr_in *sin,
                                 nlm_hosts[hash] = host;
                         }
                         nlm_get_host(host);
-                        up(&nlm_host_sema);
+                        mutex_unlock(&nlm_host_mutex);
                         return host;
                 }
         }
@@ -123,12 +124,14 @@ nlm_lookup_host(int server, struct sockaddr_in *sin,
         nlm_hosts[hash]    = host;
         INIT_LIST_HEAD(&host->h_lockowners);
         spin_lock_init(&host->h_lock);
+        INIT_LIST_HEAD(&host->h_granted);
+        INIT_LIST_HEAD(&host->h_reclaim);
 
         if (++nrhosts > NLM_HOST_MAX)
                 next_gc = 0;
 
 nohost:
-        up(&nlm_host_sema);
+        mutex_unlock(&nlm_host_mutex);
         return host;
 }
 
@@ -139,19 +142,19 @@ nlm_find_client(void)
          * and return it
          */
         int hash;
-        down(&nlm_host_sema);
+        mutex_lock(&nlm_host_mutex);
         for (hash = 0 ; hash < NLM_HOST_NRHASH; hash++) {
                 struct nlm_host *host, **hp;
                 for (hp = &nlm_hosts[hash]; (host = *hp) != 0; hp = &host->h_next) {
                         if (host->h_server &&
                             host->h_killed == 0) {
                                 nlm_get_host(host);
-                                up(&nlm_host_sema);
+                                mutex_unlock(&nlm_host_mutex);
                                 return host;
                         }
                 }
         }
-        up(&nlm_host_sema);
+        mutex_unlock(&nlm_host_mutex);
         return NULL;
 }
 
@@ -191,11 +194,12 @@ nlm_bind_host(struct nlm_host *host)
                 xprt->resvport = 1;     /* NLM requires a reserved port */
 
                 /* Existing NLM servers accept AUTH_UNIX only */
-                clnt = rpc_create_client(xprt, host->h_name, &nlm_program,
+                clnt = rpc_new_client(xprt, host->h_name, &nlm_program,
                                         host->h_version, RPC_AUTH_UNIX);
                 if (IS_ERR(clnt))
                         goto forgetit;
                 clnt->cl_autobind = 1;  /* turn on pmap queries */
+                clnt->cl_softrtry = 1; /* All queries are soft */
 
                 host->h_rpcclnt = clnt;
         }
@@ -242,8 +246,12 @@ void nlm_release_host(struct nlm_host *host)
 {
         if (host != NULL) {
                 dprintk("lockd: release host %s\n", host->h_name);
-                atomic_dec(&host->h_count);
                 BUG_ON(atomic_read(&host->h_count) < 0);
+                if (atomic_dec_and_test(&host->h_count)) {
+                        BUG_ON(!list_empty(&host->h_lockowners));
+                        BUG_ON(!list_empty(&host->h_granted));
+                        BUG_ON(!list_empty(&host->h_reclaim));
+                }
         }
 }
 
@@ -258,7 +266,7 @@ nlm_shutdown_hosts(void)
         int             i;
 
         dprintk("lockd: shutting down host module\n");
-        down(&nlm_host_sema);
+        mutex_lock(&nlm_host_mutex);
 
         /* First, make all hosts eligible for gc */
         dprintk("lockd: nuking all hosts...\n");
@@ -269,7 +277,7 @@ nlm_shutdown_hosts(void)
 
         /* Then, perform a garbage collection pass */
         nlm_gc_hosts();
-        up(&nlm_host_sema);
+        mutex_unlock(&nlm_host_mutex);
 
         /* complain if any hosts are left */
         if (nrhosts) {
@@ -331,7 +339,6 @@ nlm_gc_hosts(void)
                                         rpc_destroy_client(host->h_rpcclnt);
                                 }
                         }
-                        BUG_ON(!list_empty(&host->h_lockowners));
                         kfree(host);
                         nrhosts--;
                 }