diff options
| author | Stanislav Kinsbursky <skinsbursky@parallels.com> | 2012-07-25 14:55:54 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2012-07-27 22:48:43 +0200 |
| commit | b26411f85d3763ec5fc553854d9c3c0966072090 (patch) | |
| tree | 7d8437dee426b9d0000a9e5b2553e0e3fade822f /fs/lockd/host.c | |
| parent | nfsd4: fix missing fault_inject.h include (diff) | |
| download | linux-b26411f85d3763ec5fc553854d9c3c0966072090.tar.xz linux-b26411f85d3763ec5fc553854d9c3c0966072090.zip | |
LockD: mark host per network namespace on garbage collect
This is required for per-network NLM shutdown and cleanup.
This patch passes init_net for a while.
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/lockd/host.c')
| -rw-r--r-- | fs/lockd/host.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/lockd/host.c b/fs/lockd/host.c index eb75ca7c2d6e..2c5f41b098e9 100644 --- a/fs/lockd/host.c +++ b/fs/lockd/host.c @@ -628,13 +628,14 @@ nlm_gc_hosts(void) 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) 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 (atomic_read(&host->h_count) || host->h_inuse |