Commit ee3cf32a authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

tcp/dccp: remove BH disable/enable in lookup

Since linux 2.6.29, lookups only use rcu locking.
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ca065d0c
...@@ -280,11 +280,8 @@ static inline struct sock *inet_lookup_listener(struct net *net, ...@@ -280,11 +280,8 @@ static inline struct sock *inet_lookup_listener(struct net *net,
net_eq(sock_net(__sk), (__net))) net_eq(sock_net(__sk), (__net)))
#endif /* 64-bit arch */ #endif /* 64-bit arch */
/* /* Sockets in TCP_CLOSE state are _always_ taken out of the hash, so we need
* Sockets in TCP_CLOSE state are _always_ taken out of the hash, so we need
* not check it for lookups anymore, thanks Alexey. -DaveM * not check it for lookups anymore, thanks Alexey. -DaveM
*
* Local BH must be disabled here.
*/ */
struct sock *__inet_lookup_established(struct net *net, struct sock *__inet_lookup_established(struct net *net,
struct inet_hashinfo *hashinfo, struct inet_hashinfo *hashinfo,
...@@ -326,10 +323,8 @@ static inline struct sock *inet_lookup(struct net *net, ...@@ -326,10 +323,8 @@ static inline struct sock *inet_lookup(struct net *net,
{ {
struct sock *sk; struct sock *sk;
local_bh_disable();
sk = __inet_lookup(net, hashinfo, skb, doff, saddr, sport, daddr, sk = __inet_lookup(net, hashinfo, skb, doff, saddr, sport, daddr,
dport, dif); dport, dif);
local_bh_enable();
return sk; return sk;
} }
......
...@@ -200,10 +200,8 @@ struct sock *inet6_lookup(struct net *net, struct inet_hashinfo *hashinfo, ...@@ -200,10 +200,8 @@ struct sock *inet6_lookup(struct net *net, struct inet_hashinfo *hashinfo,
{ {
struct sock *sk; struct sock *sk;
local_bh_disable();
sk = __inet6_lookup(net, hashinfo, skb, doff, saddr, sport, daddr, sk = __inet6_lookup(net, hashinfo, skb, doff, saddr, sport, daddr,
ntohs(dport), dif); ntohs(dport), dif);
local_bh_enable();
return sk; return sk;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment