The following commit has been merged into the locking/core branch of tip:
Commit-ID: cfb8364aec4317f8e0695e4c9779b3413ce36ef4
Gitweb: https://git.kernel.org/tip/cfb8364aec4317f8e0695e4c9779b3413ce36ef4
Author: Jangwoong Kim <6812skiii@xxxxxxxxx>
AuthorDate: Wed, 30 Dec 2020 21:29:53 +09:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Wed, 27 Jan 2021 12:37:27 +01:00
futex: Remove unneeded gotos
Get rid of gotos that do not contain any cleanup. These were not removed in
commit 9180bd467f9a ("futex: Remove put_futex_key()").
Signed-off-by: Jangwoong Kim <6812skiii@xxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20201230122953.10473-1-6812skiii@xxxxxxxxx
---
kernel/futex.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/kernel/futex.c b/kernel/futex.c
index d0775aa..f3570a2 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -3024,7 +3024,7 @@ retry:
* 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 @@ retry:
* wake_futex_pi has detected invalid state. Tell user
* space.
*/
- goto out_putkey;
+ return ret;
}
/*
@@ -3062,7 +3062,7 @@ retry:
default:
WARN_ON_ONCE(1);
- goto out_putkey;
+ return ret;
}
}
@@ -3073,7 +3073,6 @@ retry:
out_unlock:
spin_unlock(&hb->lock);
-out_putkey:
return ret;
pi_retry:
|