diff options
author | Eric Dumazet <dada1@cosmosbay.com> | 2008-11-24 03:09:29 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-24 03:09:29 -0500 |
commit | 920de804bca61f88643bc9171bcd06f1a56c6258 (patch) | |
tree | fb4c90b4b167a4b7518ea888e99bfd18a7d301fb /net/ipv4 | |
parent | 1f87e235e6fb92c2968b52b9191de04f1aff8e77 (diff) |
net: Make sure BHs are disabled in sock_prot_inuse_add()
The rule of calling sock_prot_inuse_add() is that BHs must
be disabled. Some new calls were added where this was not
true and this tiggers warnings as reported by Ilpo.
Fix this by adding explicit BH disabling around those call sites,
or moving sock_prot_inuse_add() call inside an existing BH disabled
section.
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/inet_hashtables.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c index 11fcb87a1fdd..6a1045da48d2 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c | |||
@@ -402,9 +402,9 @@ void inet_unhash(struct sock *sk) | |||
402 | 402 | ||
403 | spin_lock_bh(lock); | 403 | spin_lock_bh(lock); |
404 | done =__sk_nulls_del_node_init_rcu(sk); | 404 | done =__sk_nulls_del_node_init_rcu(sk); |
405 | spin_unlock_bh(lock); | ||
406 | if (done) | 405 | if (done) |
407 | sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1); | 406 | sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1); |
407 | spin_unlock_bh(lock); | ||
408 | } | 408 | } |
409 | EXPORT_SYMBOL_GPL(inet_unhash); | 409 | EXPORT_SYMBOL_GPL(inet_unhash); |
410 | 410 | ||