From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754358AbbBKT7x (ORCPT ); Wed, 11 Feb 2015 14:59:53 -0500 Received: from mail-wg0-f49.google.com ([74.125.82.49]:53034 "EHLO mail-wg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754308AbbBKT7v (ORCPT ); Wed, 11 Feb 2015 14:59:51 -0500 Date: Wed, 11 Feb 2015 11:59:45 -0800 (PST) From: David Rientjes X-X-Sender: rientjes@chino.kir.corp.google.com To: "Kirill A. Shutemov" cc: Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Linus Torvalds , Michel Lespinasse , Rik van Riel Subject: Re: [PATCH 3/4] mm: move gup() -> posix mlock() error conversion out of __mm_populate In-Reply-To: <1423674728-214192-4-git-send-email-kirill.shutemov@linux.intel.com> Message-ID: References: <1423674728-214192-1-git-send-email-kirill.shutemov@linux.intel.com> <1423674728-214192-4-git-send-email-kirill.shutemov@linux.intel.com> User-Agent: Alpine 2.10 (DEB 1266 2009-07-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 11 Feb 2015, Kirill A. Shutemov wrote: > This is praparation to moving mm_populate()-related code out of > mm/mlock.c. > s/praparation/preparation/ > Signed-off-by: Kirill A. Shutemov > --- > mm/mlock.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/mm/mlock.c b/mm/mlock.c > index c3ea18323034..0837fdb26047 100644 > --- a/mm/mlock.c > +++ b/mm/mlock.c > @@ -712,7 +712,6 @@ int __mm_populate(unsigned long start, unsigned long len, int ignore_errors) > ret = 0; > continue; /* continue at next VMA */ > } > - ret = __mlock_posix_error_return(ret); > break; > } > nend = nstart + ret * PAGE_SIZE; > @@ -750,9 +749,13 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len) > error = do_mlock(start, len, 1); > > up_write(¤t->mm->mmap_sem); > - if (!error) > - error = __mm_populate(start, len, 0); > - return error; > + if (error) > + return error; > + > + error = __mm_populate(start, len, 0); > + if (error) > + return __mlock_posix_error_return(error); Extra space? > + return 0; > } > > SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len)