Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a37346f8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: change error print messages to generate warnings"

parents cea5fe73 3994d4e0

net/caif/caif_socket.c

+1 −1
Original line number Diff line number Diff line
@@ -1016,7 +1016,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);

net/ipv4/af_inet.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}

net/iucv/af_iucv.c

+1 −1
Original line number Diff line number Diff line
@@ -398,7 +398,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;

	}

net/key/af_key.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

net/packet/af_packet.c

+1 −1
Original line number Diff line number Diff line
@@ -1114,7 +1114,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;

	}