Commit 86d2adcc authored Nov 05, 2015 by Alexey Klimov Committed by Linus Torvalds Nov 05, 2015

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: Alexey Klimov <klimov.linux@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 9fbed254

mm/mlock.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -684,14 +684,13 @@ static int do_mlockall(int flags)
		SYSCALL_DEFINE1(mlockall, int, flags)
		{
		unsigned long lock_limit;
		int ret = -EINVAL;
		int ret;

		if (!flags \|\| (flags & ~(MCL_CURRENT \| MCL_FUTURE)))
		goto out;
		return -EINVAL;

		ret = -EPERM;
		if (!can_do_mlock())
		goto out;
		return -EPERM;

		if (flags & MCL_CURRENT)
		lru_add_drain_all(); /* flush pagevec */
		@@ -708,7 +707,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
		up_write(&current->mm->mmap_sem);
		if (!ret && (flags & MCL_CURRENT))
		mm_populate(0, TASK_SIZE);
		out:

		return ret;
		}