Commit 319d3b9c authored Jan 15, 2012 by Glauber Costa Committed by David S. Miller Jan 17, 2012

net: move sock_update_memcg outside of CONFIG_INET



Although only used currently for tcp sockets, this function
is now used in common sock code (for sock_clone())

Commit 475f1b52 moved the
declaration of sock_update_clone() to inside sock.c, but
this only fixes the problem when CONFIG_CGROUP_MEM_RES_CTLR_KMEM
is also not defined.

This patch here is verified to fix both problems, although
reverting the previous one is not necessary.

Signed-off-by: Glauber Costa <glommer@parallels.com>
CC: David S. Miller <davem@davemloft.net>
CC: Stephen Rothwell <sfr@canb.auug.org.au>
Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 8d9d399f

mm/memcontrol.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -373,7 +373,6 @@ static void mem_cgroup_put(struct mem_cgroup *memcg);

		/* Writing them here to avoid exposing memcg's inner layout */
		#ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM
		#ifdef CONFIG_INET
		#include <net/sock.h>
		#include <net/ip.h>

		@@ -420,6 +419,7 @@ void sock_release_memcg(struct sock *sk)
		}
		}

		#ifdef CONFIG_INET
		struct cg_proto tcp_proto_cgroup(struct mem_cgroup memcg)
		{
		if (!memcg \|\| mem_cgroup_is_root(memcg))

Admin message