From: "tip-bot2 for Jangwoong Kim" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Jangwoong Kim <6812skiii@gmail.com>,
Thomas Gleixner <tglx@linutronix.de>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: locking/core] futex: Remove unneeded gotos
Date: Wed, 27 Jan 2021 19:31:15 -0000 [thread overview]
Message-ID: <161177587575.23325.13374698629032171479.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20201230122953.10473-1-6812skiii@gmail.com>
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:
next prev parent reply other threads:[~2021-01-27 19:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-30 12:29 [PATCH] futex: Remove unneeded gotos 6812skiii
2021-01-27 19:31 ` tip-bot2 for Jangwoong Kim [this message]
2021-01-28 12:21 ` [tip: locking/core] " tip-bot2 for Jangwoong Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=161177587575.23325.13374698629032171479.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=6812skiii@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).