[07/24] mm: page_vma_mapped_walk(): use goto instead of while (1)

Commit Message

Andrew Morton June 25, 2021, 1:39 a.m. UTC

From: Hugh Dickins <[e-mail]>
Subject: mm: page_vma_mapped_walk(): use goto instead of while (1)

page_vma_mapped_walk() cleanup: add a label this_pte, matching next_pte,
and use "goto this_pte", in place of the "while (1)" loop at the end.

Link: https://lkml.kernel.org/r/[e-mail]
Signed-off-by: Hugh Dickins <[e-mail]>
Acked-by: Kirill A. Shutemov <[e-mail]>
Cc: Alistair Popple <[e-mail]>
Cc: Matthew Wilcox <[e-mail]>
Cc: Peter Xu <[e-mail]>
Cc: Ralph Campbell <[e-mail]>
Cc: Wang Yugui <[e-mail]>
Cc: Will Deacon <[e-mail]>
Cc: Yang Shi <[e-mail]>
Cc: Zi Yan <[e-mail]>
Cc: <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
---

 mm/page_vma_mapped.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Patch

--- a/mm/page_vma_mapped.c~mm-page_vma_mapped_walk-use-goto-instead-of-while-1
+++ a/mm/page_vma_mapped.c
@@ -144,6 +144,7 @@  bool page_vma_mapped_walk(struct page_vm
 {
 	struct mm_struct *mm = pvmw->vma->vm_mm;
 	struct page *page = pvmw->page;
+	unsigned long end;
 	pgd_t *pgd;
 	p4d_t *p4d;
 	pud_t *pud;
@@ -233,10 +234,7 @@  restart:
 		}
 		if (!map_pte(pvmw))
 			goto next_pte;
-	}
-	while (1) {
-		unsigned long end;
-
+this_pte:
 		if (check_pte(pvmw))
 			return true;
 next_pte:
@@ -265,6 +263,7 @@  next_pte:
 			pvmw->ptl = pte_lockptr(mm, pvmw->pmd);
 			spin_lock(pvmw->ptl);
 		}
+		goto this_pte;
 	}
 }