mm: memcg: remove unneeded checks from newpage_charge()
All callsites pass in freshly allocated pages and a valid mm. As a result, all checks pertaining to the page's mapcount, page->mapping or the fallback to init_mm are unneeded. Signed-off-by: Johannes Weiner <jweiner@redhat.com> Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Acked-by: Michal Hocko <mhocko@suse.cz> Cc: David Rientjes <rientjes@google.com> Cc: Balbir Singh <bsingharora@gmail.com> Cc: Hugh Dickins <hughd@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
00c54c0bac
commit
7a0524cfc8
|
@ -2748,19 +2748,11 @@ int mem_cgroup_newpage_charge(struct page *page,
|
||||||
{
|
{
|
||||||
if (mem_cgroup_disabled())
|
if (mem_cgroup_disabled())
|
||||||
return 0;
|
return 0;
|
||||||
/*
|
VM_BUG_ON(page_mapped(page));
|
||||||
* If already mapped, we don't have to account.
|
VM_BUG_ON(page->mapping && !PageAnon(page));
|
||||||
* If page cache, page->mapping has address_space.
|
VM_BUG_ON(!mm);
|
||||||
* But page->mapping may have out-of-use anon_vma pointer,
|
|
||||||
* detecit it by PageAnon() check. newly-mapped-anon's page->mapping
|
|
||||||
* is NULL.
|
|
||||||
*/
|
|
||||||
if (page_mapped(page) || (page->mapping && !PageAnon(page)))
|
|
||||||
return 0;
|
|
||||||
if (unlikely(!mm))
|
|
||||||
mm = &init_mm;
|
|
||||||
return mem_cgroup_charge_common(page, mm, gfp_mask,
|
return mem_cgroup_charge_common(page, mm, gfp_mask,
|
||||||
MEM_CGROUP_CHARGE_TYPE_MAPPED);
|
MEM_CGROUP_CHARGE_TYPE_MAPPED);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
Reference in New Issue