Commit f5fc3c5d authored Nov 05, 2015 by Johannes Weiner Committed by Linus Torvalds Nov 05, 2015

mm: memcontrol: eliminate root memory.current



memory.current on the root level doesn't add anything that wouldn't be
more accurate and detailed using system statistics.  It already doesn't
include slabs, and it'll be a pain to keep in sync when further memory
types are accounted in the memory controller.  Remove it.

Note that this applies to the new unified hierarchy interface only.

Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent e0ec90ee

mm/memcontrol.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -5026,7 +5026,9 @@ static void mem_cgroup_bind(struct cgroup_subsys_state *root_css)
		static u64 memory_current_read(struct cgroup_subsys_state *css,
		struct cftype *cft)
		{
		return mem_cgroup_usage(mem_cgroup_from_css(css), false);
		struct mem_cgroup *memcg = mem_cgroup_from_css(css);

		return (u64)page_counter_read(&memcg->memory) * PAGE_SIZE;
		}

		static int memory_low_show(struct seq_file m, void v)
		@@ -5138,6 +5140,7 @@ static int memory_events_show(struct seq_file m, void v)
		static struct cftype memory_files[] = {
		{
		.name = "current",
		.flags = CFTYPE_NOT_ON_ROOT,
		.read_u64 = memory_current_read,
		},
		{

Admin message