[PATCH] futex: Remove unneeded gotos

From: 6812skiii
Date: Wed Dec 30 2020 - 07:30:43 EST


From: Jangwoong Kim <6812skiii@xxxxxxxxx>

Get rid of gotos that do not contain any cleanup.

According to coding style documentation: "If there is no
cleanup needed then just return directly"

Signed-off-by: Jangwoong Kim <6812skiii@xxxxxxxxx>
---
kernel/futex.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/kernel/futex.c b/kernel/futex.c
index c47d1015d759..0490d7e7fe7f 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -3024,7 +3024,7 @@ static int futex_unlock_pi(u32 __user *uaddr, unsigned int flags)
* Success, we're done! No tricky corner cases.
*/
if (!ret)
- goto out_putkey;
+ return ret;
/*
* The atomic access to the futex value generated a
* pagefault, so retry the user-access and the wakeup:
@@ -3041,7 +3041,7 @@ static int futex_unlock_pi(u32 __user *uaddr, unsigned int flags)
* wake_futex_pi has detected invalid state. Tell user
* space.
*/
- goto out_putkey;
+ return ret;
}

/*
@@ -3062,7 +3062,7 @@ static int futex_unlock_pi(u32 __user *uaddr, unsigned int flags)

default:
WARN_ON_ONCE(1);
- goto out_putkey;
+ return ret;
}
}

@@ -3073,7 +3073,6 @@ static int futex_unlock_pi(u32 __user *uaddr, unsigned int flags)

out_unlock:
spin_unlock(&hb->lock);
-out_putkey:
return ret;

pi_retry:
--
2.17.1