6 files changed, 72 insertions, 57 deletions

diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index 572601e98dcd..ca6b16fc3101 100644
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -34,10 +34,10 @@ static DEFINE_MUTEX(nlm_host_mutex);
 
 static void                     nlm_gc_hosts(void);
 static struct nsm_handle *      __nsm_find(const struct sockaddr_in *,
-                                        const char *, int, int);
+                                        const char *, unsigned int, int);
 static struct nsm_handle *      nsm_find(const struct sockaddr_in *sin,
                                          const char *hostname,
-                                         int hostname_len);
+                                         unsigned int hostname_len);
 
 /*
  * Common host lookup routine for server & client
@@ -45,7 +45,8 @@ static struct nsm_handle *	nsm_find(const struct sockaddr_in *sin,
 static struct nlm_host *
 nlm_lookup_host(int server, const struct sockaddr_in *sin,
                 int proto, int version, const char *hostname,
-                int hostname_len, const struct sockaddr_in *ssin)
+                unsigned int hostname_len,
+                const struct sockaddr_in *ssin)
 {
         struct hlist_head *chain;
         struct hlist_node *pos;
@@ -176,7 +177,7 @@ nlm_destroy_host(struct nlm_host *host)
  */
 struct nlm_host *
 nlmclnt_lookup_host(const struct sockaddr_in *sin, int proto, int version,
-                        const char *hostname, int hostname_len)
+                        const char *hostname, unsigned int hostname_len)
 {
         struct sockaddr_in ssin = {0};
 
@@ -189,7 +190,7 @@ nlmclnt_lookup_host(const struct sockaddr_in *sin, int proto, int version,
  */
 struct nlm_host *
 nlmsvc_lookup_host(struct svc_rqst *rqstp,
-                        const char *hostname, int hostname_len)
+                        const char *hostname, unsigned int hostname_len)
 {
         struct sockaddr_in ssin = {0};
 
@@ -307,7 +308,8 @@ void nlm_release_host(struct nlm_host *host)
  * Release all resources held by that peer.
  */
 void nlm_host_rebooted(const struct sockaddr_in *sin,
-                                const char *hostname, int hostname_len,
+                                const char *hostname,
+                                unsigned int hostname_len,
                                 u32 new_state)
 {
         struct hlist_head *chain;
@@ -377,8 +379,13 @@ nlm_shutdown_hosts(void)
         /* First, make all hosts eligible for gc */
         dprintk("lockd: nuking all hosts...\n");
         for (chain = nlm_hosts; chain < nlm_hosts + NLM_HOST_NRHASH; ++chain) {
-                hlist_for_each_entry(host, pos, chain, h_hash)
+                hlist_for_each_entry(host, pos, chain, h_hash) {
                         host->h_expires = jiffies - 1;
+                        if (host->h_rpcclnt) {
+                                rpc_shutdown_client(host->h_rpcclnt);
+                                host->h_rpcclnt = NULL;
+                        }
+                }
         }
 
         /* Then, perform a garbage collection pass */
@@ -449,7 +456,7 @@ static DEFINE_MUTEX(nsm_mutex);
 
 static struct nsm_handle *
 __nsm_find(const struct sockaddr_in *sin,
-                const char *hostname, int hostname_len,
+                const char *hostname, unsigned int hostname_len,
                 int create)
 {
         struct nsm_handle *nsm = NULL;
@@ -503,7 +510,8 @@ out:
 }
 
 static struct nsm_handle *
-nsm_find(const struct sockaddr_in *sin, const char *hostname, int hostname_len)
+nsm_find(const struct sockaddr_in *sin, const char *hostname,
+         unsigned int hostname_len)
 {
         return __nsm_find(sin, hostname, hostname_len, 1);
 }
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index 82e2192a0d5c..08226464e563 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -219,19 +219,6 @@ lockd(struct svc_rqst *rqstp)
         module_put_and_exit(0);
 }
 
-
-static int find_socket(struct svc_serv *serv, int proto)
-{
-        struct svc_sock *svsk;
-        int found = 0;
-        list_for_each_entry(svsk, &serv->sv_permsocks, sk_list)
-                if (svsk->sk_sk->sk_protocol == proto) {
-                        found = 1;
-                        break;
-                }
-        return found;
-}
-
 /*
  * Make any sockets that are needed but not present.
  * If nlm_udpport or nlm_tcpport were set as module
@@ -240,17 +227,25 @@ static int find_socket(struct svc_serv *serv, int proto)
 static int make_socks(struct svc_serv *serv, int proto)
 {
         static int warned;
+        struct svc_xprt *xprt;
         int err = 0;
 
-        if (proto == IPPROTO_UDP || nlm_udpport)
-                if (!find_socket(serv, IPPROTO_UDP))
-                        err = svc_makesock(serv, IPPROTO_UDP, nlm_udpport,
-                                                SVC_SOCK_DEFAULTS);
-        if (err >= 0 && (proto == IPPROTO_TCP || nlm_tcpport))
-                if (!find_socket(serv, IPPROTO_TCP))
-                        err = svc_makesock(serv, IPPROTO_TCP, nlm_tcpport,
-                                                SVC_SOCK_DEFAULTS);
-
+        if (proto == IPPROTO_UDP || nlm_udpport) {
+                xprt = svc_find_xprt(serv, "udp", 0, 0);
+                if (!xprt)
+                        err = svc_create_xprt(serv, "udp", nlm_udpport,
+                                              SVC_SOCK_DEFAULTS);
+                else
+                        svc_xprt_put(xprt);
+        }
+        if (err >= 0 && (proto == IPPROTO_TCP || nlm_tcpport)) {
+                xprt = svc_find_xprt(serv, "tcp", 0, 0);
+                if (!xprt)
+                        err = svc_create_xprt(serv, "tcp", nlm_tcpport,
+                                              SVC_SOCK_DEFAULTS);
+                else
+                        svc_xprt_put(xprt);
+        }
         if (err >= 0) {
                 warned = 0;
                 err = 0;
diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c
index bf27b6c6cb6b..385437e3387d 100644
--- a/fs/lockd/svc4proc.c
+++ b/fs/lockd/svc4proc.c
@@ -84,6 +84,7 @@ nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp,
 {
         struct nlm_host *host;
         struct nlm_file *file;
+        int rc = rpc_success;
 
         dprintk("lockd: TEST4        called\n");
         resp->cookie = argp->cookie;
@@ -91,7 +92,7 @@ nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp,
         /* Don't accept test requests during grace period */
         if (nlmsvc_grace_period) {
                 resp->status = nlm_lck_denied_grace_period;
-                return rpc_success;
+                return rc;
         }
 
         /* Obtain client and file */
@@ -101,12 +102,13 @@ nlm4svc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp,
         /* Now check for conflicting locks */
         resp->status = nlmsvc_testlock(rqstp, file, &argp->lock, &resp->lock, &resp->cookie);
         if (resp->status == nlm_drop_reply)
-                return rpc_drop_reply;
+                rc = rpc_drop_reply;
+        else
+                dprintk("lockd: TEST4        status %d\n", ntohl(resp->status));
 
-        dprintk("lockd: TEST4          status %d\n", ntohl(resp->status));
         nlm_release_host(host);
         nlm_release_file(file);
-        return rpc_success;
+        return rc;
 }
 
 static __be32
@@ -115,6 +117,7 @@ nlm4svc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp,
 {
         struct nlm_host *host;
         struct nlm_file *file;
+        int rc = rpc_success;
 
         dprintk("lockd: LOCK          called\n");
 
@@ -123,7 +126,7 @@ nlm4svc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp,
         /* Don't accept new lock requests during grace period */
         if (nlmsvc_grace_period && !argp->reclaim) {
                 resp->status = nlm_lck_denied_grace_period;
-                return rpc_success;
+                return rc;
         }
 
         /* Obtain client and file */
@@ -146,12 +149,13 @@ nlm4svc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp,
         resp->status = nlmsvc_lock(rqstp, file, &argp->lock,
                                         argp->block, &argp->cookie);
         if (resp->status == nlm_drop_reply)
-                return rpc_drop_reply;
+                rc = rpc_drop_reply;
+        else
+                dprintk("lockd: LOCK         status %d\n", ntohl(resp->status));
 
-        dprintk("lockd: LOCK          status %d\n", ntohl(resp->status));
         nlm_release_host(host);
         nlm_release_file(file);
-        return rpc_success;
+        return rc;
 }
 
 static __be32
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
index d120ec39bcb0..2f4d8fa66689 100644
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
@@ -501,25 +501,29 @@ nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file,
                         block, block->b_flags, block->b_fl);
                 if (block->b_flags & B_TIMED_OUT) {
                         nlmsvc_unlink_block(block);
-                        return nlm_lck_denied;
+                        ret = nlm_lck_denied;
+                        goto out;
                 }
                 if (block->b_flags & B_GOT_CALLBACK) {
+                        nlmsvc_unlink_block(block);
                         if (block->b_fl != NULL
                                         && block->b_fl->fl_type != F_UNLCK) {
                                 lock->fl = *block->b_fl;
                                 goto conf_lock;
-                        }
-                        else {
-                                nlmsvc_unlink_block(block);
-                                return nlm_granted;
+                        } else {
+                                ret = nlm_granted;
+                                goto out;
                         }
                 }
-                return nlm_drop_reply;
+                ret = nlm_drop_reply;
+                goto out;
         }
 
         error = vfs_test_lock(file->f_file, &lock->fl);
-        if (error == -EINPROGRESS)
-                return nlmsvc_defer_lock_rqst(rqstp, block);
+        if (error == -EINPROGRESS) {
+                ret = nlmsvc_defer_lock_rqst(rqstp, block);
+                goto out;
+        }
         if (error) {
                 ret = nlm_lck_denied_nolocks;
                 goto out;
diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c
index 9cd5c8b37593..88379cc6e0b1 100644
--- a/fs/lockd/svcproc.c
+++ b/fs/lockd/svcproc.c
@@ -113,6 +113,7 @@ nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp,
 {
         struct nlm_host *host;
         struct nlm_file *file;
+        int rc = rpc_success;
 
         dprintk("lockd: TEST          called\n");
         resp->cookie = argp->cookie;
@@ -120,7 +121,7 @@ nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp,
         /* Don't accept test requests during grace period */
         if (nlmsvc_grace_period) {
                 resp->status = nlm_lck_denied_grace_period;
-                return rpc_success;
+                return rc;
         }
 
         /* Obtain client and file */
@@ -130,13 +131,14 @@ nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_args *argp,
         /* Now check for conflicting locks */
         resp->status = cast_status(nlmsvc_testlock(rqstp, file, &argp->lock, &resp->lock, &resp->cookie));
         if (resp->status == nlm_drop_reply)
-                return rpc_drop_reply;
+                rc = rpc_drop_reply;
+        else
+                dprintk("lockd: TEST          status %d vers %d\n",
+                        ntohl(resp->status), rqstp->rq_vers);
 
-        dprintk("lockd: TEST          status %d vers %d\n",
-                ntohl(resp->status), rqstp->rq_vers);
         nlm_release_host(host);
         nlm_release_file(file);
-        return rpc_success;
+        return rc;
 }
 
 static __be32
@@ -145,6 +147,7 @@ nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp,
 {
         struct nlm_host *host;
         struct nlm_file *file;
+        int rc = rpc_success;
 
         dprintk("lockd: LOCK          called\n");
 
@@ -153,7 +156,7 @@ nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp,
         /* Don't accept new lock requests during grace period */
         if (nlmsvc_grace_period && !argp->reclaim) {
                 resp->status = nlm_lck_denied_grace_period;
-                return rpc_success;
+                return rc;
         }
 
         /* Obtain client and file */
@@ -176,12 +179,13 @@ nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_args *argp,
         resp->status = cast_status(nlmsvc_lock(rqstp, file, &argp->lock,
                                                argp->block, &argp->cookie));
         if (resp->status == nlm_drop_reply)
-                return rpc_drop_reply;
+                rc = rpc_drop_reply;
+        else
+                dprintk("lockd: LOCK         status %d\n", ntohl(resp->status));
 
-        dprintk("lockd: LOCK          status %d\n", ntohl(resp->status));
         nlm_release_host(host);
         nlm_release_file(file);
-        return rpc_success;
+        return rc;
 }
 
 static __be32
diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c
index 84ebba33b98d..dbbefbcd6712 100644
--- a/fs/lockd/svcsubs.c
+++ b/fs/lockd/svcsubs.c
@@ -87,7 +87,7 @@ nlm_lookup_file(struct svc_rqst *rqstp, struct nlm_file **result,
         unsigned int    hash;
         __be32          nfserr;
 
-        nlm_debug_print_fh("nlm_file_lookup", f);
+        nlm_debug_print_fh("nlm_lookup_file", f);
 
         hash = file_hash(f);