mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 14:13:01 -04:00
[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>
This commit is contained in:
parent
8efa6e93cb
commit
c29a0bc4df
11 changed files with 34 additions and 28 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue