Commit 424cdc14 authored by Shaohua Li's avatar Shaohua Li Committed by Linus Torvalds

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: default avatarShaohua Li <shli@fb.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8d740a37
...@@ -3387,6 +3387,7 @@ static int __mem_cgroup_usage_register_event(struct mem_cgroup *memcg, ...@@ -3387,6 +3387,7 @@ static int __mem_cgroup_usage_register_event(struct mem_cgroup *memcg,
ret = page_counter_memparse(args, "-1", &threshold); ret = page_counter_memparse(args, "-1", &threshold);
if (ret) if (ret)
return ret; return ret;
threshold <<= PAGE_SHIFT;
mutex_lock(&memcg->thresholds_lock); mutex_lock(&memcg->thresholds_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment