| From: Miaohe Lin <linmiaohe@huawei.com> |
| Subject: 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> |
| --- |
| |
| mm/huge_memory.c | 4 +--- |
| mm/migrate.c | 4 +--- |
| 2 files changed, 2 insertions(+), 6 deletions(-) |
| |
| --- a/mm/huge_memory.c~mm-remove-unneeded-local-variable-follflags-v2 |
| +++ a/mm/huge_memory.c |
| @@ -2953,7 +2953,6 @@ static int split_huge_pages_pid(int pid, |
| */ |
| 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, |
| } |
| |
| /* 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; |
| --- a/mm/migrate.c~mm-remove-unneeded-local-variable-follflags-v2 |
| +++ a/mm/migrate.c |
| @@ -1611,7 +1611,6 @@ static int add_page_for_migration(struct |
| { |
| 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 |
| 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)) |
| _ |
