Commit 86d2adcc authored by Alexey Klimov's avatar Alexey Klimov Committed by Linus Torvalds

mm/mlock.c: reorganize mlockall() return values and remove goto-out label

In mlockall syscall wrapper after out-label for goto code just doing
return.  Remove goto out statements and return error values directly.

Also instead of rewriting ret variable before every if-check move returns
to 'error'-like path under if-check.

Objdump asm listing showed me reducing by few asm lines.  Object file size
descreased from 220592 bytes to 220528 bytes for me (for aarch64).
Signed-off-by: default avatarAlexey Klimov <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent 9fbed254
...@@ -684,14 +684,13 @@ static int do_mlockall(int flags) ...@@ -684,14 +684,13 @@ static int do_mlockall(int flags)
SYSCALL_DEFINE1(mlockall, int, flags) SYSCALL_DEFINE1(mlockall, int, flags)
{ {
unsigned long lock_limit; unsigned long lock_limit;
int ret = -EINVAL; int ret;
if (!flags || (flags & ~(MCL_CURRENT | MCL_FUTURE))) if (!flags || (flags & ~(MCL_CURRENT | MCL_FUTURE)))
goto out; return -EINVAL;
ret = -EPERM;
if (!can_do_mlock()) if (!can_do_mlock())
goto out; return -EPERM;
if (flags & MCL_CURRENT) if (flags & MCL_CURRENT)
lru_add_drain_all(); /* flush pagevec */ lru_add_drain_all(); /* flush pagevec */
...@@ -708,7 +707,7 @@ SYSCALL_DEFINE1(mlockall, int, flags) ...@@ -708,7 +707,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
up_write(&current->mm->mmap_sem); up_write(&current->mm->mmap_sem);
if (!ret && (flags & MCL_CURRENT)) if (!ret && (flags & MCL_CURRENT))
mm_populate(0, TASK_SIZE); mm_populate(0, TASK_SIZE);
return ret; return ret;
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment