syscall/mlockall: reorganize return values and remove goto-out label
Subsystems (2)
PATCH 1/1 syscall/mlockall: reorganize 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 <[email protected]>
--- mm/mlock.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
mm/mlock.c +4 -5
@@ -684,14 +684,13 @@ out: 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 (¤t->mm->mmap_sem);if (!ret && (flags &MCL_CURRENT ))mm_populate (0 ,TASK_SIZE ); -out: +return ret; }
Signature · 7 lines
2.1.4 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"[email protected]"> [email protected] </a>