Commit 87d2762e authored Mar 22, 2022 by Miaohe Lin Committed by Linus Torvalds Mar 22, 2022

mm: remove unneeded local variable follflags

We can pass FOLL_GET | FOLL_DUMP to follow_page directly to simplify the
code a bit in add_page_for_migration and split_huge_pages_pid.

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

Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 4e936ecc

mm/huge_memory.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -2953,7 +2953,6 @@ static int split_huge_pages_pid(int pid, unsigned long vaddr_start,
		*/
		for (addr = vaddr_start; addr < vaddr_end; addr += PAGE_SIZE) {
		struct vm_area_struct *vma = find_vma(mm, addr);
		unsigned int follflags;
		struct page *page;

		if (!vma \|\| addr < vma->vm_start)
		@@ -2966,8 +2965,7 @@ static int split_huge_pages_pid(int pid, unsigned long vaddr_start,
		}

		/* FOLL_DUMP to ignore special (like zero) pages */
		follflags = FOLL_GET \| FOLL_DUMP;
		page = follow_page(vma, addr, follflags);
		page = follow_page(vma, addr, FOLL_GET \| FOLL_DUMP);

		if (IS_ERR(page))
		continue;

mm/migrate.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -1611,7 +1611,6 @@ static int add_page_for_migration(struct mm_struct *mm, unsigned long addr,
		{
		struct vm_area_struct *vma;
		struct page *page;
		unsigned int follflags;
		int err;

		mmap_read_lock(mm);
		@@ -1621,8 +1620,7 @@ static int add_page_for_migration(struct mm_struct *mm, unsigned long addr,
		goto out;

		/* FOLL_DUMP to ignore special (like zero) pages */
		follflags = FOLL_GET \| FOLL_DUMP;
		page = follow_page(vma, addr, follflags);
		page = follow_page(vma, addr, FOLL_GET \| FOLL_DUMP);

		err = PTR_ERR(page);
		if (IS_ERR(page))