sock: add net to prot->enter_memory_pressure callback
The tcp_enter_memory_pressure calls NET_INC_STATS, but doesn't have where to get the net from. I decided to add a sk argument, not the net itself, only to factor all the required sock_net(sk) calls inside the enter_memory_pressure callback itself. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
cf1100a7a4
commit
5c52ba170f
@@ -316,7 +316,7 @@ int tcp_memory_pressure __read_mostly;
|
||||
|
||||
EXPORT_SYMBOL(tcp_memory_pressure);
|
||||
|
||||
void tcp_enter_memory_pressure(void)
|
||||
void tcp_enter_memory_pressure(struct sock *sk)
|
||||
{
|
||||
if (!tcp_memory_pressure) {
|
||||
NET_INC_STATS(LINUX_MIB_TCPMEMORYPRESSURES);
|
||||
@@ -649,7 +649,7 @@ struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp)
|
||||
}
|
||||
__kfree_skb(skb);
|
||||
} else {
|
||||
sk->sk_prot->enter_memory_pressure();
|
||||
sk->sk_prot->enter_memory_pressure(sk);
|
||||
sk_stream_moderate_sndbuf(sk);
|
||||
}
|
||||
return NULL;
|
||||
|
Reference in New Issue
Block a user