LockD: make garbage collector network namespace aware.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
parent
b26411f85d
commit
27adaddc8d
|
@ -45,7 +45,7 @@ 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 */
|
||||
|
@ -345,7 +345,7 @@ 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();
|
||||
nlm_gc_hosts(net);
|
||||
|
||||
chain = &nlm_server_hosts[nlm_hash_address(ni.sap)];
|
||||
hlist_for_each_entry(host, pos, chain, h_hash) {
|
||||
|
@ -588,7 +588,7 @@ 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);
|
||||
}
|
||||
|
||||
|
@ -623,27 +623,31 @@ 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;
|
||||
struct net *net = &init_net;
|
||||
|
||||
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(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);
|
||||
|
|
Loading…
Reference in a new issue