]> git.baikalelectronics.ru Git - kernel.git/commit
net: tcp_memcontrol: simplify linkage between socket and page counter
authorJohannes Weiner <hannes@cmpxchg.org>
Thu, 14 Jan 2016 23:21:17 +0000 (15:21 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Jan 2016 00:00:49 +0000 (16:00 -0800)
commit596aa79a53ad83b316808195c17fc6c2a8a71b31
treeb1b168157c38ef0533d2c8765bb3016d6a495cac
parentb50e284a75fd37fd8c6d11c54576131c8bc3d54f
net: tcp_memcontrol: simplify linkage between socket and page counter

There won't be any separate counters for socket memory consumed by
protocols other than TCP in the future.  Remove the indirection and link
sockets directly to their owning memory cgroup.

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>
include/linux/memcontrol.h
include/net/sock.h
include/net/tcp.h
include/net/tcp_memcontrol.h
mm/memcontrol.c
net/core/sock.c
net/ipv4/tcp_ipv4.c
net/ipv4/tcp_memcontrol.c
net/ipv4/tcp_output.c
net/ipv6/tcp_ipv6.c