diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2008-03-31 19:41:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-31 19:41:46 -0700 |
| commit | c29a0bc4dfc4d833eb702b1929cec96a3eeb9f7a (patch) | |
| tree | 4917ad0bd8979dcae34f626032b28e62b9e358fd /include | |
| parent | 8efa6e93cb2666dceafc4844057fdcb9aa324fb7 (diff) | |
[SOCK][NETNS]: Add a struct net argument to sock_prot_inuse_add and _get.
This counter is about to become per-proto-and-per-net, so we'll need
two arguments to determine which cell in this "table" to work with.
All the places, but proc already pass proper net to it - proc will be
tuned a bit later.
Some indentation with spaces in proc files is done to keep the file
coding style consistent.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/sock.h | 7 | ||||
| -rw-r--r-- | include/net/udp.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 2a3344f666a..f4fdd101c9a 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -635,10 +635,11 @@ static inline void sk_refcnt_debug_release(const struct sock *sk) #ifdef CONFIG_PROC_FS /* Called with local bh disabled */ -extern void sock_prot_inuse_add(struct proto *prot, int inc); -extern int sock_prot_inuse_get(struct proto *proto); +extern void sock_prot_inuse_add(struct net *net, struct proto *prot, int inc); +extern int sock_prot_inuse_get(struct net *net, struct proto *proto); #else -static void inline sock_prot_inuse_add(struct proto *prot, int inc) +static void inline sock_prot_inuse_add(struct net *net, struct proto *prot, + int inc) { } #endif diff --git a/include/net/udp.h b/include/net/udp.h index 24a41fa3164..3e55a99b0ba 100644 --- a/include/net/udp.h +++ b/include/net/udp.h @@ -115,7 +115,7 @@ static inline void udp_lib_unhash(struct sock *sk) write_lock_bh(&udp_hash_lock); if (sk_del_node_init(sk)) { inet_sk(sk)->num = 0; - sock_prot_inuse_add(sk->sk_prot, -1); + sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1); } write_unlock_bh(&udp_hash_lock); } |