diff options
Diffstat (limited to 'net/ipv4/tcp.c')
-rw-r--r-- | net/ipv4/tcp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 86e2cf2ff770..feb2e25091b1 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
@@ -1745,9 +1745,9 @@ do_prequeue: | |||
1745 | } | 1745 | } |
1746 | if ((flags & MSG_PEEK) && | 1746 | if ((flags & MSG_PEEK) && |
1747 | (peek_seq - copied - urg_hole != tp->copied_seq)) { | 1747 | (peek_seq - copied - urg_hole != tp->copied_seq)) { |
1748 | if (net_ratelimit()) | 1748 | net_dbg_ratelimited("TCP(%s:%d): Application bug, race in MSG_PEEK\n", |
1749 | printk(KERN_DEBUG "TCP(%s:%d): Application bug, race in MSG_PEEK.\n", | 1749 | current->comm, |
1750 | current->comm, task_pid_nr(current)); | 1750 | task_pid_nr(current)); |
1751 | peek_seq = tp->copied_seq; | 1751 | peek_seq = tp->copied_seq; |
1752 | } | 1752 | } |
1753 | continue; | 1753 | continue; |
@@ -2002,10 +2002,10 @@ bool tcp_check_oom(struct sock *sk, int shift) | |||
2002 | too_many_orphans = tcp_too_many_orphans(sk, shift); | 2002 | too_many_orphans = tcp_too_many_orphans(sk, shift); |
2003 | out_of_socket_memory = tcp_out_of_memory(sk); | 2003 | out_of_socket_memory = tcp_out_of_memory(sk); |
2004 | 2004 | ||
2005 | if (too_many_orphans && net_ratelimit()) | 2005 | if (too_many_orphans) |
2006 | pr_info("too many orphaned sockets\n"); | 2006 | net_info_ratelimited("too many orphaned sockets\n"); |
2007 | if (out_of_socket_memory && net_ratelimit()) | 2007 | if (out_of_socket_memory) |
2008 | pr_info("out of memory -- consider tuning tcp_mem\n"); | 2008 | net_info_ratelimited("out of memory -- consider tuning tcp_mem\n"); |
2009 | return too_many_orphans || out_of_socket_memory; | 2009 | return too_many_orphans || out_of_socket_memory; |
2010 | } | 2010 | } |
2011 | 2011 | ||