Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c561259c authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Linus Torvalds
Browse files

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: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Cc: Michel Lespinasse <walken@google.com>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fc05f566

mm/mlock.c

+7 −4
Original line number Diff line number Diff line
@@ -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);

	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)