mm: move gup() -> posix mlock() error conversion out of __mm_populate

This is praparation to moving mm_populate()-related code out of
mm/mlock.c.

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Acked-by: David Rientjes <rientjes@google.com>
Cc: Michel Lespinasse <walken@google.com>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 7 insertions, 4 deletions

diff --git a/mm/mlock.c b/mm/mlock.c
index 9d0f3cd716c5..0214263fca45 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(&current->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);
+        return 0;
 }
 
 SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len)