lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[RAW]: Consolidate proto->unhash callback

Browse Source 
Same as the ->hash one, this is easily consolidated.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pavel Emelyanov
2007-11-19 22:37:58 -08:00
committed by David S. Miller
parent 65b4c50b47
commit ab70768ec7
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/raw.h
View File

@@ -40,5 +40,6 @@ extern void raw_proc_exit(void);
#endif #endif
void raw_hash_sk(struct sock *sk, struct raw_hashinfo *h); void raw_hash_sk(struct sock *sk, struct raw_hashinfo *h);
void raw_unhash_sk(struct sock *sk, struct raw_hashinfo *h);
#endif /* _RAW_H */ #endif /* _RAW_H */

14
net/ipv4/raw.c
View File

@@ -97,6 +97,15 @@ void raw_hash_sk(struct sock *sk, struct raw_hashinfo *h)
} }
EXPORT_SYMBOL_GPL(raw_hash_sk); EXPORT_SYMBOL_GPL(raw_hash_sk);
void raw_unhash_sk(struct sock *sk, struct raw_hashinfo *h)
{
write_lock_bh(&h->lock);
if (sk_del_node_init(sk))
sock_prot_dec_use(sk->sk_prot);
write_unlock_bh(&h->lock);
}
EXPORT_SYMBOL_GPL(raw_unhash_sk);
static void raw_v4_hash(struct sock *sk) static void raw_v4_hash(struct sock *sk)
{ {
raw_hash_sk(sk, &raw_v4_hashinfo); raw_hash_sk(sk, &raw_v4_hashinfo);
@@ -104,10 +113,7 @@ static void raw_v4_hash(struct sock *sk)
static void raw_v4_unhash(struct sock *sk) static void raw_v4_unhash(struct sock *sk)
{ {
write_lock_bh(&raw_v4_hashinfo.lock); raw_unhash_sk(sk, &raw_v4_hashinfo);
if (sk_del_node_init(sk))
sock_prot_dec_use(sk->sk_prot);
write_unlock_bh(&raw_v4_hashinfo.lock);
} }
static struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num, static struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num,

5
net/ipv6/raw.c
View File

@@ -72,10 +72,7 @@ static void raw_v6_hash(struct sock *sk)
static void raw_v6_unhash(struct sock *sk) static void raw_v6_unhash(struct sock *sk)
{ {
write_lock_bh(&raw_v6_hashinfo.lock); raw_unhash_sk(sk, &raw_v6_hashinfo);
if (sk_del_node_init(sk))
sock_prot_dec_use(sk->sk_prot);
write_unlock_bh(&raw_v6_hashinfo.lock);
} }