Messages in this thread | | | Subject | Re: [PATCH] net: Disambiguate kernel message | From | Joe Perches <> | Date | Tue, 31 Jan 2012 12:09:06 -0800 |
| |
On Tue, 2012-01-31 at 11:47 -0800, Arun Sharma wrote: > On Tue, Jan 31, 2012 at 10:50:57AM -0800, Joe Perches wrote: > > It might be useful to use a generic routine. [] > diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c [] > @@ -2014,11 +2014,14 @@ adjudge_to_death: [] > + too_many_orphans = tcp_too_many_orphans(sk, 0); > + out_of_socket_memory = tcp_out_of_memory(sk); > + tcp_log_oom(too_many_orphans, out_of_socket_memory); [] > diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c [] > @@ -77,10 +78,10 @@ static int tcp_out_of_resources(struct sock *sk, int do_reset) [] > + too_many_orphans = tcp_too_many_orphans(sk, shift); > + out_of_socket_memory = tcp_out_of_memory(sk); > + tcp_log_oom(too_many_orphans, out_of_socket_memory); > + if (too_many_orphans || out_of_socket_memory) {
Perhaps these repeated three lines should be a routine like:
bool tcp_check_oom(struct sock *sk, int shift) { bool tcp_orphans = tcp_too_many_orphans(sk, shift); bool tcp_oom = tcp_out_of_memory(sk);
printks...
return tcp_orphans || tcp_oom; }
| |