diff options
Diffstat (limited to 'net/ipv4/af_inet.c')
-rw-r--r-- | net/ipv4/af_inet.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index dd919d84285f..a107f49eea41 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c | |||
@@ -148,10 +148,10 @@ void inet_sock_destruct(struct sock *sk) | |||
148 | return; | 148 | return; |
149 | } | 149 | } |
150 | 150 | ||
151 | BUG_TRAP(!atomic_read(&sk->sk_rmem_alloc)); | 151 | WARN_ON(atomic_read(&sk->sk_rmem_alloc)); |
152 | BUG_TRAP(!atomic_read(&sk->sk_wmem_alloc)); | 152 | WARN_ON(atomic_read(&sk->sk_wmem_alloc)); |
153 | BUG_TRAP(!sk->sk_wmem_queued); | 153 | WARN_ON(sk->sk_wmem_queued); |
154 | BUG_TRAP(!sk->sk_forward_alloc); | 154 | WARN_ON(sk->sk_forward_alloc); |
155 | 155 | ||
156 | kfree(inet->opt); | 156 | kfree(inet->opt); |
157 | dst_release(sk->sk_dst_cache); | 157 | dst_release(sk->sk_dst_cache); |
@@ -341,7 +341,7 @@ lookup_protocol: | |||
341 | answer_flags = answer->flags; | 341 | answer_flags = answer->flags; |
342 | rcu_read_unlock(); | 342 | rcu_read_unlock(); |
343 | 343 | ||
344 | BUG_TRAP(answer_prot->slab != NULL); | 344 | WARN_ON(answer_prot->slab == NULL); |
345 | 345 | ||
346 | err = -ENOBUFS; | 346 | err = -ENOBUFS; |
347 | sk = sk_alloc(net, PF_INET, GFP_KERNEL, answer_prot); | 347 | sk = sk_alloc(net, PF_INET, GFP_KERNEL, answer_prot); |
@@ -661,8 +661,8 @@ int inet_accept(struct socket *sock, struct socket *newsock, int flags) | |||
661 | 661 | ||
662 | lock_sock(sk2); | 662 | lock_sock(sk2); |
663 | 663 | ||
664 | BUG_TRAP((1 << sk2->sk_state) & | 664 | WARN_ON(!((1 << sk2->sk_state) & |
665 | (TCPF_ESTABLISHED | TCPF_CLOSE_WAIT | TCPF_CLOSE)); | 665 | (TCPF_ESTABLISHED | TCPF_CLOSE_WAIT | TCPF_CLOSE))); |
666 | 666 | ||
667 | sock_graft(sk2, newsock); | 667 | sock_graft(sk2, newsock); |
668 | 668 | ||