* [PATCH] futex: Remove unneeded gotos
@ 2020-12-30 12:29 6812skiii
2021-01-27 19:31 ` [tip: locking/core] " tip-bot2 for Jangwoong Kim
2021-01-28 12:21 ` tip-bot2 for Jangwoong Kim
0 siblings, 2 replies; 3+ messages in thread
From: 6812skiii @ 2020-12-30 12:29 UTC (permalink / raw)
To: tglx, mingo; +Cc: peterz, dvhart, linux-kernel, Jangwoong Kim
From: Jangwoong Kim <6812skiii@gmail.com>
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@gmail.com>
---
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* [tip: locking/core] futex: Remove unneeded gotos
2020-12-30 12:29 [PATCH] futex: Remove unneeded gotos 6812skiii
@ 2021-01-27 19:31 ` tip-bot2 for Jangwoong Kim
2021-01-28 12:21 ` tip-bot2 for Jangwoong Kim
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot2 for Jangwoong Kim @ 2021-01-27 19:31 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Jangwoong Kim, Thomas Gleixner, x86, linux-kernel
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@gmail.com>
AuthorDate: Wed, 30 Dec 2020 21:29:53 +09:00
Committer: Thomas Gleixner <tglx@linutronix.de>
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@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20201230122953.10473-1-6812skiii@gmail.com
---
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:
^ permalink raw reply [flat|nested] 3+ messages in thread* [tip: locking/core] futex: Remove unneeded gotos
2020-12-30 12:29 [PATCH] futex: Remove unneeded gotos 6812skiii
2021-01-27 19:31 ` [tip: locking/core] " tip-bot2 for Jangwoong Kim
@ 2021-01-28 12:21 ` tip-bot2 for Jangwoong Kim
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot2 for Jangwoong Kim @ 2021-01-28 12:21 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Jangwoong Kim, Thomas Gleixner, x86, linux-kernel
The following commit has been merged into the locking/core branch of tip:
Commit-ID: 0f9438503ea1312ef49be4d9762e0f0006546364
Gitweb: https://git.kernel.org/tip/0f9438503ea1312ef49be4d9762e0f0006546364
Author: Jangwoong Kim <6812skiii@gmail.com>
AuthorDate: Wed, 30 Dec 2020 21:29:53 +09:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Thu, 28 Jan 2021 13:20:18 +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@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20201230122953.10473-1-6812skiii@gmail.com
---
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:
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-01-28 12:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-30 12:29 [PATCH] futex: Remove unneeded gotos 6812skiii
2021-01-27 19:31 ` [tip: locking/core] " tip-bot2 for Jangwoong Kim
2021-01-28 12:21 ` tip-bot2 for Jangwoong Kim
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®