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 f440a9f54924..d9f15ddac316 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); |
@@ -338,7 +338,7 @@ lookup_protocol: | |||
338 | answer_flags = answer->flags; | 338 | answer_flags = answer->flags; |
339 | rcu_read_unlock(); | 339 | rcu_read_unlock(); |
340 | 340 | ||
341 | BUG_TRAP(answer_prot->slab != NULL); | 341 | WARN_ON(answer_prot->slab == NULL); |
342 | 342 | ||
343 | err = -ENOBUFS; | 343 | err = -ENOBUFS; |
344 | sk = sk_alloc(net, PF_INET, GFP_KERNEL, answer_prot); | 344 | sk = sk_alloc(net, PF_INET, GFP_KERNEL, answer_prot); |
@@ -658,8 +658,8 @@ int inet_accept(struct socket *sock, struct socket *newsock, int flags) | |||
658 | 658 | ||
659 | lock_sock(sk2); | 659 | lock_sock(sk2); |
660 | 660 | ||
661 | BUG_TRAP((1 << sk2->sk_state) & | 661 | WARN_ON(!((1 << sk2->sk_state) & |
662 | (TCPF_ESTABLISHED | TCPF_CLOSE_WAIT | TCPF_CLOSE)); | 662 | (TCPF_ESTABLISHED | TCPF_CLOSE_WAIT | TCPF_CLOSE))); |
663 | 663 | ||
664 | sock_graft(sk2, newsock); | 664 | sock_graft(sk2, newsock); |
665 | 665 | ||