1 files changed, 62 insertions, 30 deletions

diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index eb75ca7c2d6e..f9b22e58f78f 100644
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -21,6 +21,8 @@
 
 #include <net/ipv6.h>
 
+#include "netns.h"
+
 #define NLMDBG_FACILITY         NLMDBG_HOSTCACHE
 #define NLM_HOST_NRHASH         32
 #define NLM_HOST_REBIND         (60 * HZ)
@@ -41,11 +43,10 @@ static struct hlist_head	nlm_client_hosts[NLM_HOST_NRHASH];
                 hlist_for_each_entry_safe((host), (pos), (next), \
                                                 (chain), h_hash)
 
-static unsigned long            next_gc;
 static unsigned long            nrhosts;
 static DEFINE_MUTEX(nlm_host_mutex);
 
-static void                     nlm_gc_hosts(void);
+static void                     nlm_gc_hosts(struct net *net);
 
 struct nlm_lookup_host_info {
         const int               server;         /* search for server|client */
@@ -172,6 +173,7 @@ out:
 static void nlm_destroy_host_locked(struct nlm_host *host)
 {
         struct rpc_clnt *clnt;
+        struct lockd_net *ln = net_generic(host->net, lockd_net_id);
 
         dprintk("lockd: destroy host %s\n", host->h_name);
 
@@ -188,6 +190,7 @@ static void nlm_destroy_host_locked(struct nlm_host *host)
                 rpc_shutdown_client(clnt);
         kfree(host);
 
+        ln->nrhosts--;
         nrhosts--;
 }
 
@@ -228,6 +231,7 @@ struct nlm_host *nlmclnt_lookup_host(const struct sockaddr *sap,
         struct hlist_node *pos;
         struct nlm_host *host;
         struct nsm_handle *nsm = NULL;
+        struct lockd_net *ln = net_generic(net, lockd_net_id);
 
         dprintk("lockd: %s(host='%s', vers=%u, proto=%s)\n", __func__,
                         (hostname ? hostname : "<none>"), version,
@@ -262,6 +266,7 @@ struct nlm_host *nlmclnt_lookup_host(const struct sockaddr *sap,
                 goto out;
 
         hlist_add_head(&host->h_hash, chain);
+        ln->nrhosts++;
         nrhosts++;
 
         dprintk("lockd: %s created host %s (%s)\n", __func__,
@@ -326,7 +331,7 @@ struct nlm_host *nlmsvc_lookup_host(const struct svc_rqst *rqstp,
         struct nsm_handle *nsm = NULL;
         struct sockaddr *src_sap = svc_daddr(rqstp);
         size_t src_len = rqstp->rq_daddrlen;
-        struct net *net = rqstp->rq_xprt->xpt_net;
+        struct net *net = SVC_NET(rqstp);
         struct nlm_lookup_host_info ni = {
                 .server         = 1,
                 .sap            = svc_addr(rqstp),
@@ -337,6 +342,7 @@ struct nlm_host *nlmsvc_lookup_host(const struct svc_rqst *rqstp,
                 .hostname_len   = hostname_len,
                 .net            = net,
         };
+        struct lockd_net *ln = net_generic(net, lockd_net_id);
 
         dprintk("lockd: %s(host='%*s', vers=%u, proto=%s)\n", __func__,
                         (int)hostname_len, hostname, rqstp->rq_vers,
@@ -344,8 +350,8 @@ struct nlm_host *nlmsvc_lookup_host(const struct svc_rqst *rqstp,
 
         mutex_lock(&nlm_host_mutex);
 
-        if (time_after_eq(jiffies, next_gc))
-                nlm_gc_hosts();
+        if (time_after_eq(jiffies, ln->next_gc))
+                nlm_gc_hosts(net);
 
         chain = &nlm_server_hosts[nlm_hash_address(ni.sap)];
         hlist_for_each_entry(host, pos, chain, h_hash) {
@@ -382,6 +388,7 @@ struct nlm_host *nlmsvc_lookup_host(const struct svc_rqst *rqstp,
         memcpy(nlm_srcaddr(host), src_sap, src_len);
         host->h_srcaddrlen = src_len;
         hlist_add_head(&host->h_hash, chain);
+        ln->nrhosts++;
         nrhosts++;
 
         dprintk("lockd: %s created host %s (%s)\n",
@@ -565,6 +572,35 @@ void nlm_host_rebooted(const struct nlm_reboot *info)
         nsm_release(nsm);
 }
 
+static void nlm_complain_hosts(struct net *net)
+{
+        struct hlist_head *chain;
+        struct hlist_node *pos;
+        struct nlm_host *host;
+
+        if (net) {
+                struct lockd_net *ln = net_generic(net, lockd_net_id);
+
+                if (ln->nrhosts == 0)
+                        return;
+                printk(KERN_WARNING "lockd: couldn't shutdown host module for net %p!\n", net);
+                dprintk("lockd: %lu hosts left in net %p:\n", ln->nrhosts, net);
+        } else {
+                if (nrhosts == 0)
+                        return;
+                printk(KERN_WARNING "lockd: couldn't shutdown host module!\n");
+                dprintk("lockd: %lu hosts left:\n", nrhosts);
+        }
+
+        for_each_host(host, pos, chain, nlm_server_hosts) {
+                if (net && host->net != net)
+                        continue;
+                dprintk("       %s (cnt %d use %d exp %ld net %p)\n",
+                        host->h_name, atomic_read(&host->h_count),
+                        host->h_inuse, host->h_expires, host->net);
+        }
+}
+
 void
 nlm_shutdown_hosts_net(struct net *net)
 {
@@ -572,11 +608,10 @@ nlm_shutdown_hosts_net(struct net *net)
         struct hlist_node *pos;
         struct nlm_host *host;
 
-        dprintk("lockd: shutting down host module\n");
         mutex_lock(&nlm_host_mutex);
 
         /* First, make all hosts eligible for gc */
-        dprintk("lockd: nuking all hosts...\n");
+        dprintk("lockd: nuking all hosts in net %p...\n", net);
         for_each_host(host, pos, chain, nlm_server_hosts) {
                 if (net && host->net != net)
                         continue;
@@ -588,8 +623,10 @@ nlm_shutdown_hosts_net(struct net *net)
         }
 
         /* Then, perform a garbage collection pass */
-        nlm_gc_hosts();
+        nlm_gc_hosts(net);
         mutex_unlock(&nlm_host_mutex);
+
+        nlm_complain_hosts(net);
 }
 
 /*
@@ -599,22 +636,8 @@ nlm_shutdown_hosts_net(struct net *net)
 void
 nlm_shutdown_hosts(void)
 {
-        struct hlist_head *chain;
-        struct hlist_node *pos;
-        struct nlm_host *host;
-
+        dprintk("lockd: shutting down host module\n");
         nlm_shutdown_hosts_net(NULL);
-
-        /* complain if any hosts are left */
-        if (nrhosts != 0) {
-                printk(KERN_WARNING "lockd: couldn't shutdown host module!\n");
-                dprintk("lockd: %lu hosts left:\n", nrhosts);
-                for_each_host(host, pos, chain, nlm_server_hosts) {
-                        dprintk("       %s (cnt %d use %d exp %ld net %p)\n",
-                                host->h_name, atomic_read(&host->h_count),
-                                host->h_inuse, host->h_expires, host->net);
-                }
-        }
 }
 
 /*
@@ -623,30 +646,39 @@ nlm_shutdown_hosts(void)
  * mark & sweep for resources held by remote clients.
  */
 static void
-nlm_gc_hosts(void)
+nlm_gc_hosts(struct net *net)
 {
         struct hlist_head *chain;
         struct hlist_node *pos, *next;
         struct nlm_host *host;
 
-        dprintk("lockd: host garbage collection\n");
-        for_each_host(host, pos, chain, nlm_server_hosts)
+        dprintk("lockd: host garbage collection for net %p\n", net);
+        for_each_host(host, pos, chain, nlm_server_hosts) {
+                if (net && host->net != net)
+                        continue;
                 host->h_inuse = 0;
+        }
 
         /* Mark all hosts that hold locks, blocks or shares */
-        nlmsvc_mark_resources();
+        nlmsvc_mark_resources(net);
 
         for_each_host_safe(host, pos, next, chain, nlm_server_hosts) {
+                if (net && host->net != net)
+                        continue;
                 if (atomic_read(&host->h_count) || host->h_inuse
                  || time_before(jiffies, host->h_expires)) {
                         dprintk("nlm_gc_hosts skipping %s "
-                                "(cnt %d use %d exp %ld)\n",
+                                "(cnt %d use %d exp %ld net %p)\n",
                                 host->h_name, atomic_read(&host->h_count),
-                                host->h_inuse, host->h_expires);
+                                host->h_inuse, host->h_expires, host->net);
                         continue;
                 }
                 nlm_destroy_host_locked(host);
         }
 
-        next_gc = jiffies + NLM_HOST_COLLECT;
+        if (net) {
+                struct lockd_net *ln = net_generic(net, lockd_net_id);
+
+                ln->next_gc = jiffies + NLM_HOST_COLLECT;
+        }
 }