diff options
| author | Denis V. Lunev <den@openvz.org> | 2008-04-16 01:59:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-16 01:59:46 -0700 |
| commit | 65a18ec58e5e6186103f62f720acea94dfb26f4e (patch) | |
| tree | aa0e58979c343d4519ba9dfa3a1e6a416e98e16b | |
| parent | 5d1e4468a7705db7c1415a65fd16f07113afc1b2 (diff) | |
| download | linux-65a18ec58e5e6186103f62f720acea94dfb26f4e.tar.gz linux-65a18ec58e5e6186103f62f720acea94dfb26f4e.tar.bz2 linux-65a18ec58e5e6186103f62f720acea94dfb26f4e.zip | |
[NETNS]: Add netns refcnt debug for kernel sockets.
Protocol control sockets and netlink kernel sockets should not prevent the
namespace stop request. They are initialized and disposed in a special way by
sk_change_net/sk_release_kernel.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/sock.h | 2 | ||||
| -rw-r--r-- | net/core/sock.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 09255eae93e9..dc42b44c2aa1 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1314,7 +1314,7 @@ void sock_net_set(struct sock *sk, struct net *net) static inline void sk_change_net(struct sock *sk, struct net *net) { put_net(sock_net(sk)); - sock_net_set(sk, net); + sock_net_set(sk, hold_net(net)); } extern void sock_enable_timestamp(struct sock *sk); diff --git a/net/core/sock.c b/net/core/sock.c index c0ecbdcf75d8..54c836a2216b 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1001,6 +1001,7 @@ void sk_release_kernel(struct sock *sk) sock_hold(sk); sock_release(sk->sk_socket); + release_net(sock_net(sk)); sock_net_set(sk, get_net(&init_net)); sock_put(sk); } |