LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: "Kirill A. Shutemov" <kirill@shutemov.name>
To: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
	Sasha Levin <sasha.levin@oracle.com>,
	Cyrill Gorcunov <gorcunov@openvz.org>,
	Roman Gushchin <klamm@yandex-team.ru>,
	Hugh Dickins <hughd@google.com>,
	linux-mm@kvack.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] mm/mmap.c: use while instead of if+goto
Date: Mon, 30 Mar 2015 23:54:13 +0300	[thread overview]
Message-ID: <20150330205413.GA4458@node.dhcp.inet.fi> (raw)
In-Reply-To: <1427744435-6304-1-git-send-email-linux@rasmusvillemoes.dk>

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 <linux@rasmusvillemoes.dk>


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

  reply	other threads:[~2015-03-30 20:54 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-30 19:40 Rasmus Villemoes
2015-03-30 20:54 ` Kirill A. Shutemov [this message]
2015-03-30 21:58   ` Andrew Morton
2015-03-31 10:01     ` Rasmus Villemoes

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150330205413.GA4458@node.dhcp.inet.fi \
    --to=kirill@shutemov.name \
    --cc=akpm@linux-foundation.org \
    --cc=gorcunov@openvz.org \
    --cc=hughd@google.com \
    --cc=kirill.shutemov@linux.intel.com \
    --cc=klamm@yandex-team.ru \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linux@rasmusvillemoes.dk \
    --cc=sasha.levin@oracle.com \
    --subject='Re: [PATCH] mm/mmap.c: use while instead of if+goto' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).