mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 04:18:39 +08:00
net/ipv4/tcp.c: Update WARN uses
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:
parent
b194a3674f
commit
2af6fd8b18
@ -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. */
|
||||
|
Loading…
Reference in New Issue
Block a user