mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 22:02:02 +00:00
memcg: page_cache_release not __free_page
There's nothing wrong with mem_cgroup_charge failure in do_wp_page and do_anonymous page using __free_page, but it does look odd when nearby code uses page_cache_release: use that instead (while turning a blind eye to ancient inconsistencies of page_cache_release versus put_page). Signed-off-by: Hugh Dickins <hugh@veritas.com> Cc: David Rientjes <rientjes@google.com> Acked-by: Balbir Singh <balbir@linux.vnet.ibm.com> Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Hirokazu Takahashi <taka@valinux.co.jp> Cc: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Cc: Paul Menage <menage@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
427d5416f3
commit
6dbf6d3bb9
1 changed files with 2 additions and 2 deletions
|
@ -1711,7 +1711,7 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,
|
||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
oom_free_new:
|
oom_free_new:
|
||||||
__free_page(new_page);
|
page_cache_release(new_page);
|
||||||
oom:
|
oom:
|
||||||
if (old_page)
|
if (old_page)
|
||||||
page_cache_release(old_page);
|
page_cache_release(old_page);
|
||||||
|
@ -2163,7 +2163,7 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
|
||||||
page_cache_release(page);
|
page_cache_release(page);
|
||||||
goto unlock;
|
goto unlock;
|
||||||
oom_free_page:
|
oom_free_page:
|
||||||
__free_page(page);
|
page_cache_release(page);
|
||||||
oom:
|
oom:
|
||||||
return VM_FAULT_OOM;
|
return VM_FAULT_OOM;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue