Commit 424cdc14 authored Oct 15, 2015 by Shaohua Li Committed by Linus Torvalds Oct 16, 2015

memcg: convert threshold to bytes



page_counter_memparse() returns pages for the threshold, while
mem_cgroup_usage() returns bytes for memory usage.  Convert the
threshold to bytes.

Fixes: 3e32cb2e ("memcg: rename cgroup_event to mem_cgroup_event").
Signed-off-by: Shaohua Li <shli@fb.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 8d740a37

mm/memcontrol.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -3387,6 +3387,7 @@ static int __mem_cgroup_usage_register_event(struct mem_cgroup *memcg,
		ret = page_counter_memparse(args, "-1", &threshold);
		if (ret)
		return ret;
		threshold <<= PAGE_SHIFT;

		mutex_lock(&memcg->thresholds_lock);