]> Pileus Git - ~andy/linux/commit
tcp_memcontrol: Cleanup/fix cg_proto->memory_pressure handling.
authorEric W. Biederman <ebiederm@xmission.com>
Thu, 5 Dec 2013 04:12:04 +0000 (20:12 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 6 Dec 2013 02:01:01 +0000 (21:01 -0500)
commit7f2cbdc28c034ef2c3be729681f631d5744e3cd5
tree22555da20fc62c75e47334e3d30db407f88a5ec4
parent86d9be263a7ad6f17214d7f112b4c8739137485d
tcp_memcontrol: Cleanup/fix cg_proto->memory_pressure handling.

kill memcg_tcp_enter_memory_pressure.  The only function of
memcg_tcp_enter_memory_pressure was to reduce deal with the
unnecessary abstraction that was tcp_memcontrol.  Now that struct
tcp_memcontrol is gone remove this unnecessary function, the
unnecessary function pointer, and modify sk_enter_memory_pressure to
set this field directly, just as sk_leave_memory_pressure cleas this
field directly.

This fixes a small bug I intruduced when killing struct tcp_memcontrol
that caused memcg_tcp_enter_memory_pressure to never be called and
thus failed to ever set cg_proto->memory_pressure.

Remove the cg_proto enter_memory_pressure function as it now serves
no useful purpose.

Don't test cg_proto->memory_presser in sk_leave_memory_pressure before
clearing it.  The test was originally there to ensure that the pointer
was non-NULL.  Now that cg_proto is not a pointer the pointer does not
matter.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/sock.h
net/ipv4/tcp_memcontrol.c