mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 14:19:16 +00:00
memcg: mem_cgroup_move_parent() doesn't need gfp_mask
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>
This commit is contained in:
parent
d845aa2c75
commit
6068bf0104
1 changed files with 2 additions and 3 deletions
|
@ -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,
|
||||||
|
|
||||||
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. */
|
||||||
|
|
Loading…
Reference in a new issue