Skip to contentSkip to conversation

net: use WARN() for the WARN_ON in commit b6b39e8f3fbbb

PATCH Applied Arjan van de Ven 2 participants 2 messages Oct 23, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: use WARN() for the WARN_ON in commit b6b39e8f3fbbb

Quoted 1 line

From d63ae5a34f2ed0821870c9e4c797e4e095f0c58a Mon Sep 17 00:00:00 2001

From: Arjan van de Ven <[email protected]>
Date: Thu, 22 Oct 2009 20:32:24 -0700
Subject: [PATCH] net: use WARN() for the WARN_ON in commit b6b39e8f3fbbb

Commit b6b39e8f3fbbb (tcp: Try to catch MSG_PEEK bug) added a printk() to the WARN_ON() that's in tcp.c. This patch changes this combination to WARN(); the advantage of WARN() is that the printk message shows up inside the message, so that kerneloops.org will collect the message.

In addition, this gets rid of an extra if() statement.

---
 net/ipv4/tcp.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
net/ipv4/tcp.c +3 -3
index 90b2e06..a0e56db 100644
@@ -1442,9 +1442,9 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 				goto found_ok_skb;
 			if (tcp_hdr(skb)->fin)
 				goto found_fin_ok;
-			if (WARN_ON(!(flags & MSG_PEEK)))
-				printk(KERN_INFO "recvmsg bug 2: copied %X "
-				       "seq %X\n", *seq, TCP_SKB_CB(skb)->seq);
+			WARN(!(flags & MSG_PEEK), KERN_INFO "recvmsg bug 2: "
+					"copied %X seq %X\n", *seq, 
+					TCP_SKB_CB(skb)->seq);
 		}
 
 		/* Well, if we have backlog, try to process it now yet. */
Signature · 8 lines
1.6.2.5



-- 
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org
maintainer Applied
#1 lore raw

From: Arjan van de Ven <[email protected]>
Date: Thu, 22 Oct 2009 20:35:12 -0700

Quoted 8 lines

Commit b6b39e8f3fbbb (tcp: Try to catch MSG_PEEK bug) added a printk() to the WARN_ON() that's in tcp.c. This patch changes this combination to WARN(); the advantage of WARN() is that the printk message shows up inside the message, so that kerneloops.org will collect the message.

In addition, this gets rid of an extra if() statement.

Applied, thanks.