diff options
| author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2008-07-25 21:43:18 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-25 21:43:18 -0700 |
| commit | 547b792cac0a038b9dbf958d3c120df3740b5572 (patch) | |
| tree | 08554d083b0ca7d65739dc1ce12f9b12a9b8e1f8 /net/core/stream.c | |
| 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/core/stream.c')
| -rw-r--r-- | net/core/stream.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/stream.c b/net/core/stream.c index 4a0ad152c9c..a6b3437ff08 100644 --- a/net/core/stream.c +++ b/net/core/stream.c @@ -192,13 +192,13 @@ void sk_stream_kill_queues(struct sock *sk) __skb_queue_purge(&sk->sk_error_queue); /* Next, the write queue. */ - BUG_TRAP(skb_queue_empty(&sk->sk_write_queue)); + WARN_ON(!skb_queue_empty(&sk->sk_write_queue)); /* Account for returned memory. */ sk_mem_reclaim(sk); - BUG_TRAP(!sk->sk_wmem_queued); - BUG_TRAP(!sk->sk_forward_alloc); + WARN_ON(sk->sk_wmem_queued); + WARN_ON(sk->sk_forward_alloc); /* It is _impossible_ for the backlog to contain anything * when we get here. All user references to this socket |