diff options
| author | David S. Miller <davem@davemloft.net> | 2012-01-24 22:57:24 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-24 22:57:24 -0500 |
| commit | c54a45700195d9491e2cc2115ea61315a8ba3927 (patch) | |
| tree | c87ae0da5bf7c8b79241fdc8d694785092a42a4c /net/core/sock.c | |
| parent | 61d57f87f3fb04a305f22befabd042ffbec8b852 (diff) | |
| parent | 701b259f446be2f3625fb852bceb93afe76e206d (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/core/sock.c')
| -rw-r--r-- | net/core/sock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 5c5af9988f94..3e81fd2e3c75 100644 --- a/net/core/sock.c +++ b/net/core/sock.c | |||
| @@ -1827,7 +1827,7 @@ suppress_allocation: | |||
| 1827 | /* Alas. Undo changes. */ | 1827 | /* Alas. Undo changes. */ |
| 1828 | sk->sk_forward_alloc -= amt * SK_MEM_QUANTUM; | 1828 | sk->sk_forward_alloc -= amt * SK_MEM_QUANTUM; |
| 1829 | 1829 | ||
| 1830 | sk_memory_allocated_sub(sk, amt, parent_status); | 1830 | sk_memory_allocated_sub(sk, amt); |
| 1831 | 1831 | ||
| 1832 | return 0; | 1832 | return 0; |
| 1833 | } | 1833 | } |
| @@ -1840,7 +1840,7 @@ EXPORT_SYMBOL(__sk_mem_schedule); | |||
| 1840 | void __sk_mem_reclaim(struct sock *sk) | 1840 | void __sk_mem_reclaim(struct sock *sk) |
| 1841 | { | 1841 | { |
| 1842 | sk_memory_allocated_sub(sk, | 1842 | sk_memory_allocated_sub(sk, |
| 1843 | sk->sk_forward_alloc >> SK_MEM_QUANTUM_SHIFT, 0); | 1843 | sk->sk_forward_alloc >> SK_MEM_QUANTUM_SHIFT); |
| 1844 | sk->sk_forward_alloc &= SK_MEM_QUANTUM - 1; | 1844 | sk->sk_forward_alloc &= SK_MEM_QUANTUM - 1; |
| 1845 | 1845 | ||
| 1846 | if (sk_under_memory_pressure(sk) && | 1846 | if (sk_under_memory_pressure(sk) && |