3 files changed, 35 insertions, 27 deletions

diff --git a/fs/lockd/clntxdr.c b/fs/lockd/clntxdr.c
index d269ada7670..982d2676e1f 100644
--- a/fs/lockd/clntxdr.c
+++ b/fs/lockd/clntxdr.c
@@ -223,7 +223,7 @@ static void encode_nlm_stat(struct xdr_stream *xdr,
 {
         __be32 *p;
 
-        BUG_ON(be32_to_cpu(stat) > NLM_LCK_DENIED_GRACE_PERIOD);
+        WARN_ON_ONCE(be32_to_cpu(stat) > NLM_LCK_DENIED_GRACE_PERIOD);
         p = xdr_reserve_space(xdr, 4);
         *p = stat;
 }
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index e4fb3ba5a58..3d7e09bcc0e 100644
--- a/fs/lockd/mon.c
+++ b/fs/lockd/mon.c
@@ -85,29 +85,38 @@ static struct rpc_clnt *nsm_create(struct net *net)
         return rpc_create(&args);
 }
 
+static struct rpc_clnt *nsm_client_set(struct lockd_net *ln,
+                struct rpc_clnt *clnt)
+{
+        spin_lock(&ln->nsm_clnt_lock);
+        if (ln->nsm_users == 0) {
+                if (clnt == NULL)
+                        goto out;
+                ln->nsm_clnt = clnt;
+        }
+        clnt = ln->nsm_clnt;
+        ln->nsm_users++;
+out:
+        spin_unlock(&ln->nsm_clnt_lock);
+        return clnt;
+}
+
 static struct rpc_clnt *nsm_client_get(struct net *net)
 {
-        static DEFINE_MUTEX(nsm_create_mutex);
-        struct rpc_clnt *clnt;
+        struct rpc_clnt *clnt, *new;
         struct lockd_net *ln = net_generic(net, lockd_net_id);
 
-        spin_lock(&ln->nsm_clnt_lock);
-        if (ln->nsm_users) {
-                ln->nsm_users++;
-                clnt = ln->nsm_clnt;
-                spin_unlock(&ln->nsm_clnt_lock);
+        clnt = nsm_client_set(ln, NULL);
+        if (clnt != NULL)
                 goto out;
-        }
-        spin_unlock(&ln->nsm_clnt_lock);
 
-        mutex_lock(&nsm_create_mutex);
-        clnt = nsm_create(net);
-        if (!IS_ERR(clnt)) {
-                ln->nsm_clnt = clnt;
-                smp_wmb();
-                ln->nsm_users = 1;
-        }
-        mutex_unlock(&nsm_create_mutex);
+        clnt = new = nsm_create(net);
+        if (IS_ERR(clnt))
+                goto out;
+
+        clnt = nsm_client_set(ln, new);
+        if (clnt != new)
+                rpc_shutdown_client(new);
 out:
         return clnt;
 }
@@ -115,18 +124,16 @@ out:
 static void nsm_client_put(struct net *net)
 {
         struct lockd_net *ln = net_generic(net, lockd_net_id);
-        struct rpc_clnt *clnt = ln->nsm_clnt;
-        int shutdown = 0;
+        struct rpc_clnt *clnt = NULL;
 
         spin_lock(&ln->nsm_clnt_lock);
-        if (ln->nsm_users) {
-                if (--ln->nsm_users)
-                        ln->nsm_clnt = NULL;
-                shutdown = !ln->nsm_users;
+        ln->nsm_users--;
+        if (ln->nsm_users == 0) {
+                clnt = ln->nsm_clnt;
+                ln->nsm_clnt = NULL;
         }
         spin_unlock(&ln->nsm_clnt_lock);
-
-        if (shutdown)
+        if (clnt != NULL)
                 rpc_shutdown_client(clnt);
 }
 
diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c
index 3009a365e08..21171f0c647 100644
--- a/fs/lockd/svcproc.c
+++ b/fs/lockd/svcproc.c
@@ -68,7 +68,8 @@ nlmsvc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp,
 
         /* Obtain file pointer. Not used by FREE_ALL call. */
         if (filp != NULL) {
-                if ((error = nlm_lookup_file(rqstp, &file, &lock->fh)) != 0)
+                error = cast_status(nlm_lookup_file(rqstp, &file, &lock->fh));
+                if (error != 0)
                         goto no_locks;
                 *filp = file;