diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-04-18 02:17:34 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-18 02:17:34 -0400 |
commit | e56d8b8a2ee5fb7f63ceba58e1c0fb3c844888a4 (patch) | |
tree | cc145929b5b5dd3e7d2ddeb75cba6c7813a5c206 /include/net/inet_hashtables.h | |
parent | 8b73a07c8ffaa70683022566080f4df3328ea18d (diff) |
[INET]: Drop the inet_inherit_port() call.
As I can see from the code, two places (tcp_v6_syn_recv_sock and
dccp_v6_request_recv_sock) that call this one already run with
BHs disabled, so it's safe to call __inet_inherit_port there.
Besides (in case I missed smth with code review) the calltrace
tcp_v6_syn_recv_sock
`- tcp_v4_syn_recv_sock
`- __inet_inherit_port
and the similar for DCCP are valid, but assumes BHs to be disabled.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/inet_hashtables.h')
-rw-r--r-- | include/net/inet_hashtables.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h index 5525227c5e92..5ec91d88b517 100644 --- a/include/net/inet_hashtables.h +++ b/include/net/inet_hashtables.h | |||
@@ -235,13 +235,6 @@ static inline void __inet_inherit_port(struct sock *sk, struct sock *child) | |||
235 | spin_unlock(&head->lock); | 235 | spin_unlock(&head->lock); |
236 | } | 236 | } |
237 | 237 | ||
238 | static inline void inet_inherit_port(struct sock *sk, struct sock *child) | ||
239 | { | ||
240 | local_bh_disable(); | ||
241 | __inet_inherit_port(sk, child); | ||
242 | local_bh_enable(); | ||
243 | } | ||
244 | |||
245 | extern void inet_put_port(struct sock *sk); | 238 | extern void inet_put_port(struct sock *sk); |
246 | 239 | ||
247 | extern void inet_listen_wlock(struct inet_hashinfo *hashinfo); | 240 | extern void inet_listen_wlock(struct inet_hashinfo *hashinfo); |