From: Joe Perches <joe@perches.com>
To: Jiri Kosina <trivial@kernel.org>
Cc: "David S. Miller" <davem@davemloft.net>,
Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>,
"Pekka Savola (ipv6)" <pekkas@netcore.fi>,
James Morris <jmorris@namei.org>,
Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
Patrick McHardy <kaber@trash.net>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 36/39] net/ipv4/tcp.c: Update WARN uses
Date: Sat, 30 Oct 2010 14:08:53 -0700 [thread overview]
Message-ID: <2afee732758b93d7464e6bb07a52b3bc67f164a4.1288471898.git.joe@perches.com> (raw)
In-Reply-To: <cover.1288471897.git.joe@perches.com>
Coalesce long formats.
Align arguments.
Remove KERN_<level>.
Signed-off-by: Joe Perches <joe@perches.com>
---
net/ipv4/tcp.c | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 1664a05..5f738c5 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1193,7 +1193,7 @@ void tcp_cleanup_rbuf(struct sock *sk, int copied)
struct sk_buff *skb = skb_peek(&sk->sk_receive_queue);
WARN(skb && !before(tp->copied_seq, TCP_SKB_CB(skb)->end_seq),
- KERN_INFO "cleanup rbuf bug: copied %X seq %X rcvnxt %X\n",
+ "cleanup rbuf bug: copied %X seq %X rcvnxt %X\n",
tp->copied_seq, TCP_SKB_CB(skb)->end_seq, tp->rcv_nxt);
#endif
@@ -1477,10 +1477,9 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
* shouldn't happen.
*/
if (WARN(before(*seq, TCP_SKB_CB(skb)->seq),
- KERN_INFO "recvmsg bug: copied %X "
- "seq %X rcvnxt %X fl %X\n", *seq,
- TCP_SKB_CB(skb)->seq, tp->rcv_nxt,
- flags))
+ "recvmsg bug: copied %X seq %X rcvnxt %X fl %X\n",
+ *seq, TCP_SKB_CB(skb)->seq, tp->rcv_nxt,
+ flags))
break;
offset = *seq - TCP_SKB_CB(skb)->seq;
@@ -1490,10 +1489,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;
- WARN(!(flags & MSG_PEEK), KERN_INFO "recvmsg bug 2: "
- "copied %X seq %X rcvnxt %X fl %X\n",
- *seq, TCP_SKB_CB(skb)->seq,
- tp->rcv_nxt, flags);
+ WARN(!(flags & MSG_PEEK),
+ "recvmsg bug 2: copied %X seq %X rcvnxt %X fl %X\n",
+ *seq, TCP_SKB_CB(skb)->seq, tp->rcv_nxt, flags);
}
/* Well, if we have backlog, try to process it now yet. */
--
1.7.3.1.g432b3.dirty
next prev parent reply other threads:[~2010-10-30 21:09 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-30 21:08 [PATCH 00/39] Cleanup WARN #defines Joe Perches
2010-10-30 21:08 ` [PATCH 01/39] include/asm-generic/bug.h: Update WARN macros Joe Perches
2010-10-30 21:08 ` [PATCH 02/39] arch/alpha: Update WARN uses Joe Perches
2010-10-30 21:17 ` Matt Turner
2010-10-30 21:28 ` Joe Perches
2010-10-31 1:11 ` Michael Cree
2010-10-31 1:38 ` Joe Perches
2010-10-30 21:08 ` [PATCH 03/39] arch/arm: " Joe Perches
2010-10-30 21:08 ` [PATCH 04/39] arch/powerpc: " Joe Perches
2010-11-01 11:02 ` Michael Ellerman
2010-11-01 14:41 ` Joe Perches
2010-11-02 0:26 ` Michael Ellerman
2010-11-02 1:50 ` Joe Perches
2010-11-02 3:20 ` Michael Ellerman
2010-10-30 21:08 ` [PATCH 05/39] arch/x86: " Joe Perches
2010-10-31 1:38 ` Rafael J. Wysocki
2010-10-30 21:08 ` [PATCH 06/39] drivers/acpi: " Joe Perches
2010-10-30 21:08 ` [PATCH 07/39] drivers/base: " Joe Perches
2010-10-30 21:08 ` [PATCH 08/39] drivers/block: " Joe Perches
2010-10-30 21:08 ` [PATCH 09/39] drivers/cpuidle: " Joe Perches
2010-10-30 21:08 ` [PATCH 10/39] drivers/firewire: " Joe Perches
2010-10-30 21:57 ` Stefan Richter
2010-10-30 21:08 ` [PATCH 11/39] drivers/firmware: " Joe Perches
2010-10-30 21:08 ` [PATCH 12/39] drivers/gpio: " Joe Perches
2010-10-30 21:08 ` [PATCH 13/39] drivers/gpu/drm: " Joe Perches
2010-10-30 21:08 ` [PATCH 14/39] drivers/media/video: " Joe Perches
2010-10-30 21:08 ` [PATCH 15/39] drivers/mfd: " Joe Perches
2010-11-26 10:02 ` Samuel Ortiz
2010-10-30 21:08 ` [PATCH 16/39] drivers/net/can: " Joe Perches
2010-11-09 17:23 ` David Miller
2010-10-30 21:08 ` [PATCH 17/39] drivers/net/usb: " Joe Perches
2010-11-09 17:23 ` David Miller
2010-10-30 21:08 ` [PATCH 18/39] drivers/net/wireless/iwlwifi: " Joe Perches
2010-10-30 21:08 ` [PATCH 19/39] drivers/regulator: " Joe Perches
2010-11-01 13:25 ` Mark Brown
2010-10-30 21:08 ` [PATCH 20/39] drivers/scsi/fcoe: " Joe Perches
2010-10-30 21:08 ` [PATCH 21/39] drivers/staging: " Joe Perches
2010-11-09 23:50 ` Greg KH
2010-10-30 21:08 ` [PATCH 22/39] drivers/usb/musb: " Joe Perches
2010-11-05 11:44 ` Felipe Balbi
2010-11-05 13:54 ` Jiri Kosina
2010-11-05 13:56 ` Felipe Balbi
2010-10-30 21:08 ` [PATCH 23/39] drivers/video/omap2/dss: " Joe Perches
2010-10-30 21:08 ` [PATCH 24/39] fs/nfsd: " Joe Perches
2010-10-30 21:08 ` [PATCH 25/39] fs/notify/inotify: " Joe Perches
2010-10-30 21:08 ` [PATCH 26/39] fs/sysfs: " Joe Perches
2010-10-30 21:08 ` [PATCH 27/39] fs/proc: " Joe Perches
2010-10-30 21:08 ` [PATCH 28/39] fs: " Joe Perches
2010-10-30 21:08 ` [PATCH 29/39] include/linux/device.h: " Joe Perches
2010-10-30 21:08 ` [PATCH 30/39] kernel/irq: " Joe Perches
2010-10-30 21:08 ` [PATCH 31/39] kernel/panic.c: Update warn_slowpath to use %pV Joe Perches
2010-10-30 21:08 ` [PATCH 32/39] kernel: Update WARN uses Joe Perches
2010-10-30 21:08 ` [PATCH 33/39] lib: " Joe Perches
2010-10-30 21:08 ` [PATCH 34/39] mm: " Joe Perches
2010-11-08 12:03 ` Michał Nazarewicz
2010-10-30 21:08 ` [PATCH 35/39] net/core/dev.c: " Joe Perches
2010-11-09 17:23 ` David Miller
2010-10-30 21:08 ` Joe Perches [this message]
2010-11-09 17:23 ` [PATCH 36/39] net/ipv4/tcp.c: " David Miller
2010-10-30 21:08 ` [PATCH 37/39] net/mac80211: " Joe Perches
2010-10-31 7:33 ` Johannes Berg
2010-10-30 21:08 ` [PATCH 38/39] net/rfkill/input.c: " Joe Perches
2010-10-30 21:08 ` [PATCH 39/39] sound/soc/codecs/wm_hubs.c: " Joe Perches
2010-11-01 19:47 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2afee732758b93d7464e6bb07a52b3bc67f164a4.1288471898.git.joe@perches.com \
--to=joe@perches.com \
--cc=davem@davemloft.net \
--cc=jmorris@namei.org \
--cc=kaber@trash.net \
--cc=kuznet@ms2.inr.ac.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pekkas@netcore.fi \
--cc=trivial@kernel.org \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®