diff options
author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2008-07-26 00:43:18 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-26 00:43:18 -0400 |
commit | 547b792cac0a038b9dbf958d3c120df3740b5572 (patch) | |
tree | 08554d083b0ca7d65739dc1ce12f9b12a9b8e1f8 /net/key | |
parent | 53e5e96ec18da6f65e89f05674711e1c93d8df67 (diff) |
net: convert BUG_TRAP to generic WARN_ON
Removes legacy reinvent-the-wheel type thing. The generic
machinery integrates much better to automated debugging aids
such as kerneloops.org (and others), and is unambiguous due to
better naming. Non-intuively BUG_TRAP() is actually equal to
WARN_ON() rather than BUG_ON() though some might actually be
promoted to BUG_ON() but I left that to future.
I could make at least one BUILD_BUG_ON conversion.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/key')
-rw-r--r-- | net/key/af_key.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c index f0fc46c8038d..d628df97e02e 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c | |||
@@ -96,8 +96,8 @@ static void pfkey_sock_destruct(struct sock *sk) | |||
96 | return; | 96 | return; |
97 | } | 97 | } |
98 | 98 | ||
99 | BUG_TRAP(!atomic_read(&sk->sk_rmem_alloc)); | 99 | WARN_ON(atomic_read(&sk->sk_rmem_alloc)); |
100 | BUG_TRAP(!atomic_read(&sk->sk_wmem_alloc)); | 100 | WARN_ON(atomic_read(&sk->sk_wmem_alloc)); |
101 | 101 | ||
102 | atomic_dec(&pfkey_socks_nr); | 102 | atomic_dec(&pfkey_socks_nr); |
103 | } | 103 | } |