[PATCH] mm/mmap.c: use while instead of if+goto

* [PATCH] mm/mmap.c: use while instead of if+goto
@ 2015-03-30 19:40 Rasmus Villemoes
  2015-03-30 20:54 ` Kirill A. Shutemov
  0 siblings, 1 reply; 4+ messages in thread
From: Rasmus Villemoes @ 2015-03-30 19:40 UTC (permalink / raw)
  To: Andrew Morton, Kirill A. Shutemov, Sasha Levin, Cyrill Gorcunov,
	Roman Gushchin
  Cc: Hugh Dickins, Rasmus Villemoes, linux-mm, linux-kernel

The creators of the C language gave us the while keyword. Let's use
that instead of synthesizing it from if+goto.

Made possible by 6597d783397a ("mm/mmap.c: replace find_vma_prepare()
with clearer find_vma_links()").

Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
---
 mm/mmap.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/mm/mmap.c b/mm/mmap.c
index da9990acc08b..e1ae629b1e9c 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1553,11 +1553,9 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
 
 	/* Clear old maps */
 	error = -ENOMEM;
-munmap_back:
-	if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
+	while (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
 		if (do_munmap(mm, addr, len))
 			return -ENOMEM;
-		goto munmap_back;
 	}
 
 	/*
@@ -2741,11 +2739,9 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
 	/*
 	 * Clear old maps.  this also does some error checking for us
 	 */
- munmap_back:
-	if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
+	while (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
 		if (do_munmap(mm, addr, len))
 			return -ENOMEM;
-		goto munmap_back;
 	}
 
 	/* Check against address space limits *after* clearing old maps... */
-- 
2.1.3


^ permalink raw reply related	[flat|nested] 4+ messages in thread