From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753671AbbC3Uys (ORCPT ); Mon, 30 Mar 2015 16:54:48 -0400 Received: from mta-out1.inet.fi ([62.71.2.195]:48474 "EHLO jenni2.inet.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753155AbbC3Uyp (ORCPT ); Mon, 30 Mar 2015 16:54:45 -0400 Date: Mon, 30 Mar 2015 23:54:13 +0300 From: "Kirill A. Shutemov" To: Rasmus Villemoes Cc: Andrew Morton , "Kirill A. Shutemov" , Sasha Levin , Cyrill Gorcunov , Roman Gushchin , Hugh Dickins , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] mm/mmap.c: use while instead of if+goto Message-ID: <20150330205413.GA4458@node.dhcp.inet.fi> References: <1427744435-6304-1-git-send-email-linux@rasmusvillemoes.dk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1427744435-6304-1-git-send-email-linux@rasmusvillemoes.dk> User-Agent: Mutt/1.5.23.1 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Mar 30, 2015 at 09:40:35PM +0200, Rasmus Villemoes wrote: > 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 Looks good, except both your plus-lines are over 80-characters long for no reason. > --- > 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... */ -- Kirill A. Shutemov