lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net/ipv4/tcp.c: Update WARN uses

Browse Source 
Coalesce long formats.
Align arguments.
Remove KERN_<level>.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joe Perches
2010-10-30 11:08:53 +00:00
committed by David S. Miller
parent b194a3674f
commit 2af6fd8b18
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
net/ipv4/tcp.c
View File

@@ -1193,7 +1193,7 @@ void tcp_cleanup_rbuf(struct sock *sk, int copied)
struct sk_buff *skb = skb_peek(&sk->sk_receive_queue); struct sk_buff *skb = skb_peek(&sk->sk_receive_queue);
WARN(skb && !before(tp->copied_seq, TCP_SKB_CB(skb)->end_seq), 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); tp->copied_seq, TCP_SKB_CB(skb)->end_seq, tp->rcv_nxt);
#endif #endif
@@ -1477,9 +1477,8 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
* shouldn't happen. * shouldn't happen.
*/ */
if (WARN(before(*seq, TCP_SKB_CB(skb)->seq), if (WARN(before(*seq, TCP_SKB_CB(skb)->seq),
KERN_INFO "recvmsg bug: copied %X " "recvmsg bug: copied %X seq %X rcvnxt %X fl %X\n",
"seq %X rcvnxt %X fl %X\n", *seq, *seq, TCP_SKB_CB(skb)->seq, tp->rcv_nxt,
TCP_SKB_CB(skb)->seq, tp->rcv_nxt,
flags)) flags))
break; break;
@@ -1490,10 +1489,9 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
goto found_ok_skb; goto found_ok_skb;
if (tcp_hdr(skb)->fin) if (tcp_hdr(skb)->fin)
goto found_fin_ok; goto found_fin_ok;
WARN(!(flags & MSG_PEEK), KERN_INFO "recvmsg bug 2: " WARN(!(flags & MSG_PEEK),
"copied %X seq %X rcvnxt %X fl %X\n", "recvmsg bug 2: copied %X seq %X rcvnxt %X fl %X\n",
*seq, TCP_SKB_CB(skb)->seq, *seq, TCP_SKB_CB(skb)->seq, tp->rcv_nxt, flags);
tp->rcv_nxt, flags);
} }
/* Well, if we have backlog, try to process it now yet. */ /* Well, if we have backlog, try to process it now yet. */