Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40f23a21 authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds
Browse files

mm: memcg: remove unneeded checks from uncharge_page() 



mem_cgroup_uncharge_page() is only called on either freshly allocated
pages without page->mapping or on rmapped PageAnon() pages.  There is no
need to check for a page->mapping that is not an anon_vma.

Signed-off-by: default avatarJohannes Weiner <jweiner@redhat.com>
Acked-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
Cc: Balbir Singh <bsingharora@gmail.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7a0524cf

mm/memcontrol.c

+1 −2
Original line number Diff line number Diff line
@@ -3061,8 +3061,7 @@ void mem_cgroup_uncharge_page(struct page *page) 
	/* early check. */

	if (page_mapped(page))

		return;

	if (page->mapping && !PageAnon(page))

		return;

	VM_BUG_ON(page->mapping && !PageAnon(page));

	__mem_cgroup_uncharge_common(page, MEM_CGROUP_CHARGE_TYPE_MAPPED);

}