Commit 6068bf01 authored by KAMEZAWA Hiroyuki's avatar KAMEZAWA Hiroyuki Committed by Linus Torvalds

memcg: mem_cgroup_move_parent() doesn't need gfp_mask

Signed-off-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d845aa2c
...@@ -2643,8 +2643,7 @@ static int mem_cgroup_move_account(struct page *page, ...@@ -2643,8 +2643,7 @@ static int mem_cgroup_move_account(struct page *page,
static int mem_cgroup_move_parent(struct page *page, static int mem_cgroup_move_parent(struct page *page,
struct page_cgroup *pc, struct page_cgroup *pc,
struct mem_cgroup *child, struct mem_cgroup *child)
gfp_t gfp_mask)
{ {
struct mem_cgroup *parent; struct mem_cgroup *parent;
unsigned int nr_pages; unsigned int nr_pages;
...@@ -3652,7 +3651,7 @@ static int mem_cgroup_force_empty_list(struct mem_cgroup *memcg, ...@@ -3652,7 +3651,7 @@ static int mem_cgroup_force_empty_list(struct mem_cgroup *memcg,
pc = lookup_page_cgroup(page); pc = lookup_page_cgroup(page);
ret = mem_cgroup_move_parent(page, pc, memcg, GFP_KERNEL); ret = mem_cgroup_move_parent(page, pc, memcg);
if (ret == -EBUSY || ret == -EINVAL) { if (ret == -EBUSY || ret == -EINVAL) {
/* found lock contention or "pc" is obsolete. */ /* found lock contention or "pc" is obsolete. */
......
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