Commit 58f341f7 authored by Miaohe Lin's avatar Miaohe Lin Committed by Andrew Morton
Browse files

mm/memcg: minor cleanup for mc_handle_present_pte() 

When pagetable lock is held, the page will always be page_mapped().  So
remove unneeded page_mapped() check.  Also the page can't be freed from
under us in this case.  So use get_page() to get extra page reference to
simplify the code.  No functional change intended.

Link: https://lkml.kernel.org/r/20230717113644.3026478-1-linmiaohe@huawei.com


Signed-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Shakeel Butt <shakeelb@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 43b3dfdd

mm/memcontrol.c

+2 −3
Original line number Diff line number Diff line
@@ -5639,7 +5639,7 @@ static struct page *mc_handle_present_pte(struct vm_area_struct *vma, 
{

	struct page *page = vm_normal_page(vma, addr, ptent);



	if (!page || !page_mapped(page))

	if (!page)

		return NULL;

	if (PageAnon(page)) {

		if (!(mc.flags & MOVE_ANON))
@@ -5648,8 +5648,7 @@ static struct page *mc_handle_present_pte(struct vm_area_struct *vma, 
		if (!(mc.flags & MOVE_FILE))

			return NULL;

	}

	if (!get_page_unless_zero(page))

		return NULL;

	get_page(page);



	return page;

}