path: root/net/ipv4/tcp_memcontrol.c
diff options
authorEric W. Biederman <ebiederm@xmission.com>2013-10-19 16:24:52 -0700
committerDavid S. Miller <davem@davemloft.net>2013-10-21 18:43:02 -0400
commitf594d63199688ad568fb69f6a790b11d6d6d1ba5 (patch)
tree13dacd5aab7a7ff6a22388321a1cb7df3c793a76 /net/ipv4/tcp_memcontrol.c
parenttcp_memcontrol: Remove tcp_max_memory (diff)
tcp_memcontrol: Remove setting cgroup settings via sysctl
The code is broken and does not constrain sysctl_tcp_mem as tcp_update_limit does. With the result that it allows the cgroup tcp memory limits to be bypassed. The semantics are broken as the settings are not per netns and are in a per netns table, and instead looks at current. Since the code is broken in both design and implementation and does not implement the functionality for which it was written remove it. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
1 files changed, 0 insertions, 14 deletions
diff --git a/net/ipv4/tcp_memcontrol.c b/net/ipv4/tcp_memcontrol.c
index 82985d1dc9af..e7c01fcf5716 100644
--- a/net/ipv4/tcp_memcontrol.c
+++ b/net/ipv4/tcp_memcontrol.c
@@ -226,20 +226,6 @@ static int tcp_cgroup_reset(struct cgroup_subsys_state *css, unsigned int event)
return 0;
-void tcp_prot_mem(struct mem_cgroup *memcg, long val, int idx)
- struct tcp_memcontrol *tcp;
- struct cg_proto *cg_proto;
- cg_proto = tcp_prot.proto_cgroup(memcg);
- if (!cg_proto)
- return;
- tcp = tcp_from_cgproto(cg_proto);
- tcp->tcp_prot_mem[idx] = val;
static struct cftype tcp_files[] = {
.name = "kmem.tcp.limit_in_bytes",