[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1427744435-6304-1-git-send-email-linux@rasmusvillemoes.dk>
Date: Mon, 30 Mar 2015 21:40:35 +0200
From: Rasmus Villemoes <linux@...musvillemoes.dk>
To: Andrew Morton <akpm@...ux-foundation.org>,
"Kirill A. Shutemov" <kirill.shutemov@...ux.intel.com>,
Sasha Levin <sasha.levin@...cle.com>,
Cyrill Gorcunov <gorcunov@...nvz.org>,
Roman Gushchin <klamm@...dex-team.ru>
Cc: Hugh Dickins <hughd@...gle.com>,
Rasmus Villemoes <linux@...musvillemoes.dk>,
linux-mm@...ck.org, linux-kernel@...r.kernel.org
Subject: [PATCH] mm/mmap.c: use while instead of if+goto
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@...musvillemoes.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists