From: "tip-bot2 for Peter Zijlstra" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Peter Zijlstra (Intel)" <peterz@infradead.org>,
Ingo Molnar <mingo@kernel.org>, Davidlohr Bueso <dbueso@suse.de>,
Will Deacon <will@kernel.org>, Waiman Long <longman@redhat.com>,
Juri Lelli <juri.lelli@redhat.com>, x86 <x86@kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [tip: locking/core] locking/percpu-rwsem: Convert to bool
Date: Tue, 11 Feb 2020 12:48:23 -0000 [thread overview]
Message-ID: <158142530387.411.5572831777224897340.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20200131151539.984626569@infradead.org>
The following commit has been merged into the locking/core branch of tip:
Commit-ID: 206c98ffbeda588dbbd9d272505c42acbc364a30
Gitweb: https://git.kernel.org/tip/206c98ffbeda588dbbd9d272505c42acbc364a30
Author: Peter Zijlstra <peterz@infradead.org>
AuthorDate: Wed, 30 Oct 2019 20:12:37 +01:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Tue, 11 Feb 2020 13:10:54 +01:00
locking/percpu-rwsem: Convert to bool
Use bool where possible.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Davidlohr Bueso <dbueso@suse.de>
Acked-by: Will Deacon <will@kernel.org>
Acked-by: Waiman Long <longman@redhat.com>
Tested-by: Juri Lelli <juri.lelli@redhat.com>
Link: https://lkml.kernel.org/r/20200131151539.984626569@infradead.org
---
include/linux/percpu-rwsem.h | 6 +++---
kernel/locking/percpu-rwsem.c | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/linux/percpu-rwsem.h b/include/linux/percpu-rwsem.h
index f2c36fb..4ceaa19 100644
--- a/include/linux/percpu-rwsem.h
+++ b/include/linux/percpu-rwsem.h
@@ -41,7 +41,7 @@ is_static struct percpu_rw_semaphore name = { \
#define DEFINE_STATIC_PERCPU_RWSEM(name) \
__DEFINE_PERCPU_RWSEM(name, static)
-extern int __percpu_down_read(struct percpu_rw_semaphore *, int);
+extern bool __percpu_down_read(struct percpu_rw_semaphore *, bool);
extern void __percpu_up_read(struct percpu_rw_semaphore *);
static inline void percpu_down_read(struct percpu_rw_semaphore *sem)
@@ -69,9 +69,9 @@ static inline void percpu_down_read(struct percpu_rw_semaphore *sem)
preempt_enable();
}
-static inline int percpu_down_read_trylock(struct percpu_rw_semaphore *sem)
+static inline bool percpu_down_read_trylock(struct percpu_rw_semaphore *sem)
{
- int ret = 1;
+ bool ret = true;
preempt_disable();
/*
diff --git a/kernel/locking/percpu-rwsem.c b/kernel/locking/percpu-rwsem.c
index aa2b118..969389d 100644
--- a/kernel/locking/percpu-rwsem.c
+++ b/kernel/locking/percpu-rwsem.c
@@ -45,7 +45,7 @@ void percpu_free_rwsem(struct percpu_rw_semaphore *sem)
}
EXPORT_SYMBOL_GPL(percpu_free_rwsem);
-int __percpu_down_read(struct percpu_rw_semaphore *sem, int try)
+bool __percpu_down_read(struct percpu_rw_semaphore *sem, bool try)
{
/*
* Due to having preemption disabled the decrement happens on
@@ -69,7 +69,7 @@ int __percpu_down_read(struct percpu_rw_semaphore *sem, int try)
* release in percpu_up_write().
*/
if (likely(!smp_load_acquire(&sem->readers_block)))
- return 1;
+ return true;
/*
* Per the above comment; we still have preemption disabled and
@@ -78,7 +78,7 @@ int __percpu_down_read(struct percpu_rw_semaphore *sem, int try)
__percpu_up_read(sem);
if (try)
- return 0;
+ return false;
/*
* We either call schedule() in the wait, or we'll fall through
@@ -94,7 +94,7 @@ int __percpu_down_read(struct percpu_rw_semaphore *sem, int try)
__up_read(&sem->rw_sem);
preempt_disable();
- return 1;
+ return true;
}
EXPORT_SYMBOL_GPL(__percpu_down_read);
next prev parent reply other threads:[~2020-02-11 12:49 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-31 15:07 [PATCH -v2 0/7] locking: Percpu-rwsem rewrite Peter Zijlstra
2020-01-31 15:07 ` [PATCH -v2 1/7] locking/percpu-rwsem, lockdep: Make percpu-rwsem use its own lockdep_map Peter Zijlstra
2020-02-11 12:48 ` [tip: locking/core] " tip-bot2 for Peter Zijlstra
2020-01-31 15:07 ` [PATCH -v2 2/7] locking/percpu-rwsem: Convert to bool Peter Zijlstra
2020-02-11 12:48 ` tip-bot2 for Peter Zijlstra [this message]
2020-01-31 15:07 ` [PATCH -v2 3/7] locking/percpu-rwsem: Move __this_cpu_inc() into the slowpath Peter Zijlstra
2020-02-11 12:48 ` [tip: locking/core] " tip-bot2 for Peter Zijlstra
2020-01-31 15:07 ` [PATCH -v2 4/7] locking/percpu-rwsem: Extract __percpu_down_read_trylock() Peter Zijlstra
2020-02-11 12:48 ` [tip: locking/core] " tip-bot2 for Peter Zijlstra
2020-01-31 15:07 ` [PATCH -v2 5/7] locking/percpu-rwsem: Remove the embedded rwsem Peter Zijlstra
2020-02-03 11:45 ` Kirill Tkhai
2020-02-03 13:44 ` Peter Zijlstra
2020-02-03 14:33 ` Kirill Tkhai
2020-02-03 14:20 ` Christoph Hellwig
2020-02-03 15:09 ` Peter Zijlstra
2020-02-03 17:48 ` Christoph Hellwig
2020-02-04 8:50 ` Peter Zijlstra
2020-02-04 9:22 ` [PATCH] locking/rwsem: Remove RWSEM_OWNER_UNKNOWN Peter Zijlstra
2020-02-11 12:48 ` [tip: locking/core] " tip-bot2 for Peter Zijlstra
2020-02-04 9:24 ` [PATCH -v2-mkII 5/7] locking/percpu-rwsem: Remove the embedded rwsem Peter Zijlstra
2020-02-11 12:48 ` [tip: locking/core] " tip-bot2 for Peter Zijlstra
2020-01-31 15:07 ` [PATCH -v2 6/7] locking/percpu-rwsem: Fold __percpu_up_read() Peter Zijlstra
2020-02-11 12:48 ` [tip: locking/core] " tip-bot2 for Davidlohr Bueso
2020-01-31 15:07 ` [PATCH -v2 7/7] locking/percpu-rwsem: Add might_sleep() for writer locking Peter Zijlstra
2020-01-31 19:23 ` [PATCH -v2 0/7] locking: Percpu-rwsem rewrite Waiman Long
2020-02-01 16:23 ` Davidlohr Bueso
2020-02-03 10:51 ` Sebastian Andrzej Siewior
2020-02-03 12:25 ` Juri Lelli
2020-02-03 18:08 ` Will Deacon
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=158142530387.411.5572831777224897340.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=dbueso@suse.de \
--cc=juri.lelli@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=longman@redhat.com \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=will@kernel.org \
--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®