From 98e6bea65ea777a8b754d4f04d731c6d55021ac8 Mon Sep 17 00:00:00 2001 From: Syed Rameez Mustafa Date: Fri, 4 Oct 2013 19:03:28 -0700 Subject: [PATCH] net: change error print messages to generate warnings Given the numerous clients of sockets, it is difficult to find the offending client for the error that is being reported. Change the kernel print messages to generate a warning instead so that we get a complete call stack. Change-Id: I4bfce3e0a5aecd88c6fa4a1f900482449a4b868d Signed-off-by: Syed Rameez Mustafa --- net/caif/caif_socket.c | 2 +- net/ipv4/af_inet.c | 4 ++-- net/iucv/af_iucv.c | 2 +- net/key/af_key.c | 2 +- net/packet/af_packet.c | 2 +- net/rxrpc/af_rxrpc.c | 2 +- net/unix/af_unix.c | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c index 5016fa57b62..c2b18e6adf4 100644 --- a/net/caif/caif_socket.c +++ b/net/caif/caif_socket.c @@ -1014,7 +1014,7 @@ static void caif_sock_destructor(struct sock *sk) caif_assert(sk_unhashed(sk)); caif_assert(!sk->sk_socket); if (!sock_flag(sk, SOCK_DEAD)) { - pr_debug("Attempt to release alive CAIF socket: %p\n", sk); + WARN(1, "Attempt to release alive CAIF socket: %p\n", sk); return; } sk_stream_kill_queues(&cf_sk->sk); diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 0b711659ac7..f20b5cce0a8 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -154,12 +154,12 @@ void inet_sock_destruct(struct sock *sk) sk_mem_reclaim(sk); if (sk->sk_type == SOCK_STREAM && sk->sk_state != TCP_CLOSE) { - pr_err("Attempt to release TCP socket in state %d %p\n", + WARN(1, "Attempt to release TCP socket in state %d %p\n", sk->sk_state, sk); return; } if (!sock_flag(sk, SOCK_DEAD)) { - pr_err("Attempt to release alive inet socket %p\n", sk); + WARN(1, "Attempt to release alive inet socket %p\n", sk); return; } diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c index 07d7d55a1b9..433f7f7549e 100644 --- a/net/iucv/af_iucv.c +++ b/net/iucv/af_iucv.c @@ -408,7 +408,7 @@ static void iucv_sock_destruct(struct sock *sk) sk_mem_reclaim(sk); if (!sock_flag(sk, SOCK_DEAD)) { - pr_err("Attempt to release alive iucv socket %p\n", sk); + WARN(1, "Attempt to release alive iucv socket %p\n", sk); return; } diff --git a/net/key/af_key.c b/net/key/af_key.c index 7e5d927b576..153fbf1a1c2 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -99,7 +99,7 @@ static void pfkey_sock_destruct(struct sock *sk) skb_queue_purge(&sk->sk_receive_queue); if (!sock_flag(sk, SOCK_DEAD)) { - pr_err("Attempt to release alive pfkey socket: %p\n", sk); + WARN(1, "Attempt to release alive pfkey socket: %p\n", sk); return; } diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 4f2c0df7956..a72cd66c2fd 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -1168,7 +1168,7 @@ static void packet_sock_destruct(struct sock *sk) WARN_ON(atomic_read(&sk->sk_wmem_alloc)); if (!sock_flag(sk, SOCK_DEAD)) { - pr_err("Attempt to release alive packet socket: %p\n", sk); + WARN(1, "Attempt to release alive packet socket: %p\n", sk); return; } diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c index 74c064c0dfd..798ea393178 100644 --- a/net/rxrpc/af_rxrpc.c +++ b/net/rxrpc/af_rxrpc.c @@ -670,7 +670,7 @@ static void rxrpc_sock_destructor(struct sock *sk) WARN_ON(sk->sk_socket); if (!sock_flag(sk, SOCK_DEAD)) { - printk("Attempt to release alive rxrpc socket: %p\n", sk); + WARN(1, "Attempt to release alive rxrpc socket: %p\n", sk); return; } } diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 109e30beaa6..2a89d0129f5 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -357,7 +357,7 @@ static void unix_sock_destructor(struct sock *sk) WARN_ON(!sk_unhashed(sk)); WARN_ON(sk->sk_socket); if (!sock_flag(sk, SOCK_DEAD)) { - printk(KERN_INFO "Attempt to release alive unix socket: %p\n", sk); + WARN(1, "Attempt to release alive unix socket: %p\n", sk); return; }