diff options
| author | Johannes Weiner | 2016-01-15 00:21:11 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2016-01-15 01:00:49 +0100 |
| commit | 80f23124f57c77915a7b4201d8dcba38a38b23f0 (patch) | |
| tree | d370c585d71dc17fc9b48034cdcda5b6e1b36b22 /include/linux | |
| parent | net: tcp_memcontrol: remove dead per-memcg count of allocated sockets (diff) | |
| download | kernel-qcow2-linux-80f23124f57c77915a7b4201d8dcba38a38b23f0.tar.gz kernel-qcow2-linux-80f23124f57c77915a7b4201d8dcba38a38b23f0.tar.xz kernel-qcow2-linux-80f23124f57c77915a7b4201d8dcba38a38b23f0.zip | |
net: tcp_memcontrol: simplify the per-memcg limit access
tcp_memcontrol replicates the global sysctl_mem limit array per cgroup,
but it only ever sets these entries to the value of the memory_allocated
page_counter limit. Use the latter directly.
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Reviewed-by: Vladimir Davydov <vdavydov@virtuozzo.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/memcontrol.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 15acc04ebdd3..6c91c1b73951 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -89,7 +89,6 @@ struct cg_proto { struct page_counter memory_allocated; /* Current allocated memory. */ int memory_pressure; bool active; - long sysctl_mem[3]; /* * memcg field is used to find which memcg we belong directly * Each memcg struct can hold more than one cg_proto, so container_of |