lkml.org 
[lkml]   [2010]   [Oct]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 36/39] net/ipv4/tcp.c: Update WARN uses
    Date
    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


    \
     
     \ /
      Last update: 2010-10-30 23:11    [W:0.020 / U:1.128 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site