From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753818AbbC3TlG (ORCPT ); Mon, 30 Mar 2015 15:41:06 -0400 Received: from mail-lb0-f171.google.com ([209.85.217.171]:35152 "EHLO mail-lb0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753705AbbC3TlE (ORCPT ); Mon, 30 Mar 2015 15:41:04 -0400 From: Rasmus Villemoes To: Andrew Morton , "Kirill A. Shutemov" , Sasha Levin , Cyrill Gorcunov , Roman Gushchin Cc: Hugh Dickins , Rasmus Villemoes , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] mm/mmap.c: use while instead of if+goto Date: Mon, 30 Mar 2015 21:40:35 +0200 Message-Id: <1427744435-6304-1-git-send-email-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.1.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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