aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/inet_hashtables.h14
-rw-r--r--net/ipv4/inet_hashtables.c16
2 files changed, 17 insertions, 13 deletions
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h
index 5ec91d88b517..735b926a3497 100644
--- a/include/net/inet_hashtables.h
+++ b/include/net/inet_hashtables.h
@@ -221,19 +221,7 @@ static inline int inet_sk_listen_hashfn(const struct sock *sk)
221} 221}
222 222
223/* Caller must disable local BH processing. */ 223/* Caller must disable local BH processing. */
224static inline void __inet_inherit_port(struct sock *sk, struct sock *child) 224extern void __inet_inherit_port(struct sock *sk, struct sock *child);
225{
226 struct inet_hashinfo *table = sk->sk_prot->h.hashinfo;
227 const int bhash = inet_bhashfn(inet_sk(child)->num, table->bhash_size);
228 struct inet_bind_hashbucket *head = &table->bhash[bhash];
229 struct inet_bind_bucket *tb;
230
231 spin_lock(&head->lock);
232 tb = inet_csk(sk)->icsk_bind_hash;
233 sk_add_bind_node(child, &tb->owners);
234 inet_csk(child)->icsk_bind_hash = tb;
235 spin_unlock(&head->lock);
236}
237 225
238extern void inet_put_port(struct sock *sk); 226extern void inet_put_port(struct sock *sk);
239 227
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index 1612184ecc6f..2023d37b2708 100644
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -92,6 +92,22 @@ void inet_put_port(struct sock *sk)
92 92
93EXPORT_SYMBOL(inet_put_port); 93EXPORT_SYMBOL(inet_put_port);
94 94
95void __inet_inherit_port(struct sock *sk, struct sock *child)
96{
97 struct inet_hashinfo *table = sk->sk_prot->h.hashinfo;
98 const int bhash = inet_bhashfn(inet_sk(child)->num, table->bhash_size);
99 struct inet_bind_hashbucket *head = &table->bhash[bhash];
100 struct inet_bind_bucket *tb;
101
102 spin_lock(&head->lock);
103 tb = inet_csk(sk)->icsk_bind_hash;
104 sk_add_bind_node(child, &tb->owners);
105 inet_csk(child)->icsk_bind_hash = tb;
106 spin_unlock(&head->lock);
107}
108
109EXPORT_SYMBOL_GPL(__inet_inherit_port);
110
95/* 111/*
96 * This lock without WQ_FLAG_EXCLUSIVE is good on UP and it can be very bad on SMP. 112 * This lock without WQ_FLAG_EXCLUSIVE is good on UP and it can be very bad on SMP.
97 * Look, when several writers sleep and reader wakes them up, all but one 113 * Look, when several writers sleep and reader wakes them up, all but one