From: "tip-bot2 for André Almeida" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: andrealmeid@collabora.com, Thomas Gleixner <tglx@linutronix.de>,
x86 <x86@kernel.org>, LKML <linux-kernel@vger.kernel.org>
Subject: [tip: locking/core] futex: Consistently use fshared as boolean
Date: Fri, 17 Jul 2020 22:01:19 -0000 [thread overview]
Message-ID: <159502327949.4006.682740557157718510.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20200702202843.520764-5-andrealmeid@collabora.com>
The following commit has been merged into the locking/core branch of tip:
Commit-ID: 2f3cc106873cb8234300c381a96b0b0e4ba63ab9
Gitweb: https://git.kernel.org/tip/2f3cc106873cb8234300c381a96b0b0e4ba63ab9
Author: André Almeida <andrealmeid@collabora.com>
AuthorDate: Thu, 02 Jul 2020 17:28:43 -03:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Fri, 17 Jul 2020 23:58:50 +02:00
futex: Consistently use fshared as boolean
Since fshared is only conveying true/false values, declare it as bool.
In get_futex_key() the usage of fshared can be restricted to the first part
of the function. If fshared is false the function is terminated early and
the subsequent code can use a constant 'true' instead of the variable.
Signed-off-by: André Almeida <andrealmeid@collabora.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20200702202843.520764-5-andrealmeid@collabora.com
---
kernel/futex.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/kernel/futex.c b/kernel/futex.c
index 697835a..f483bc5 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -458,7 +458,7 @@ static u64 get_inode_sequence_number(struct inode *inode)
/**
* get_futex_key() - Get parameters which are the keys for a futex
* @uaddr: virtual address of the futex
- * @fshared: 0 for a PROCESS_PRIVATE futex, 1 for PROCESS_SHARED
+ * @fshared: false for a PROCESS_PRIVATE futex, true for PROCESS_SHARED
* @key: address where result is stored.
* @rw: mapping needs to be read/write (values: FUTEX_READ,
* FUTEX_WRITE)
@@ -482,8 +482,8 @@ static u64 get_inode_sequence_number(struct inode *inode)
*
* lock_page() might sleep, the caller should not hold a spinlock.
*/
-static int
-get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, enum futex_access rw)
+static int get_futex_key(u32 __user *uaddr, bool fshared, union futex_key *key,
+ enum futex_access rw)
{
unsigned long address = (unsigned long)uaddr;
struct mm_struct *mm = current->mm;
@@ -520,7 +520,7 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, enum futex_a
again:
/* Ignore any VERIFY_READ mapping (futex common case) */
- if (unlikely(should_fail_futex(fshared)))
+ if (unlikely(should_fail_futex(true)))
return -EFAULT;
err = get_user_pages_fast(address, 1, FOLL_WRITE, &page);
@@ -608,7 +608,7 @@ again:
* A RO anonymous page will never change and thus doesn't make
* sense for futex operations.
*/
- if (unlikely(should_fail_futex(fshared)) || ro) {
+ if (unlikely(should_fail_futex(true)) || ro) {
err = -EFAULT;
goto out;
}
next prev parent reply other threads:[~2020-07-17 22:01 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-02 20:28 [RESEND PATCH 0/4] futex: Minor code improvements André Almeida
2020-07-02 20:28 ` [RESEND PATCH 1/4] futex: Remove put_futex_key() André Almeida
2020-07-17 22:01 ` [tip: locking/core] " tip-bot2 for André Almeida
2020-07-02 20:28 ` [RESEND PATCH 2/4] futex: Remove needless goto's André Almeida
2020-07-17 22:01 ` [tip: locking/core] " tip-bot2 for André Almeida
2020-07-02 20:28 ` [RESEND PATCH 3/4] futex: Remove unused or redundant includes André Almeida
2020-07-17 21:46 ` Thomas Gleixner
2020-07-17 22:39 ` André Almeida
2020-07-18 0:02 ` Thomas Gleixner
2020-07-17 22:01 ` [tip: locking/core] " tip-bot2 for André Almeida
2020-07-18 0:01 ` tip-bot2 for André Almeida
2020-07-02 20:28 ` [RESEND PATCH 4/4] futex: Consistently use fshared as boolean André Almeida
2020-07-17 22:01 ` tip-bot2 for André Almeida [this message]
2020-07-18 0:01 ` [tip: locking/core] " tip-bot2 for André Almeida
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=159502327949.4006.682740557157718510.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=andrealmeid@collabora.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
all inboxes | Powered by JetHome®