1 files changed, 5 insertions, 4 deletions

diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index 729ac427d359..38b0e8a1aec0 100644
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -112,11 +112,12 @@ nlm_lookup_host(int server, struct sockaddr_in *sin,
         host->h_version    = version;
         host->h_proto      = proto;
         host->h_rpcclnt    = NULL;
-        init_MUTEX(&host->h_sema);
+        mutex_init(&host->h_mutex);
         host->h_nextrebind = jiffies + NLM_HOST_REBIND;
         host->h_expires    = jiffies + NLM_HOST_EXPIRE;
         atomic_set(&host->h_count, 1);
         init_waitqueue_head(&host->h_gracewait);
+        init_rwsem(&host->h_rwsem);
         host->h_state      = 0;                 /* pseudo NSM state */
         host->h_nsmstate   = 0;                 /* real NSM state */
         host->h_server     = server;
@@ -172,7 +173,7 @@ nlm_bind_host(struct nlm_host *host)
                         (unsigned)ntohl(host->h_addr.sin_addr.s_addr));
 
         /* Lock host handle */
-        down(&host->h_sema);
+        mutex_lock(&host->h_mutex);
 
         /* If we've already created an RPC client, check whether
          * RPC rebind is required
@@ -204,12 +205,12 @@ nlm_bind_host(struct nlm_host *host)
                 host->h_rpcclnt = clnt;
         }
 
-        up(&host->h_sema);
+        mutex_unlock(&host->h_mutex);
         return clnt;
 
 forgetit:
         printk("lockd: couldn't create RPC handle for %s\n", host->h_name);
-        up(&host->h_sema);
+        mutex_unlock(&host->h_mutex);
         return NULL;
 }