Skip to content

Commit

Permalink
memcg: mem_cgroup_move_parent() doesn't need gfp_mask
Browse files Browse the repository at this point in the history
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
KAMEZAWA Hiroyuki authored and Linus Torvalds committed Aug 1, 2012
1 parent d845aa2 commit 6068bf0
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions mm/memcontrol.c
Original file line number Diff line number Diff line change
Expand Up @@ -2643,8 +2643,7 @@ static int mem_cgroup_move_account(struct page *page,

static int mem_cgroup_move_parent(struct page *page,
struct page_cgroup *pc,
struct mem_cgroup *child,
gfp_t gfp_mask)
struct mem_cgroup *child)
{
struct mem_cgroup *parent;
unsigned int nr_pages;
Expand Down Expand Up @@ -3652,7 +3651,7 @@ static int mem_cgroup_force_empty_list(struct mem_cgroup *memcg,

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) {
/* found lock contention or "pc" is obsolete. */
Expand Down

0 comments on commit 6068bf0

Please sign in to comment.