From: tip-bot for Michal Hocko <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: dave@stgolabs.net, dbueso@suse.de, akpm@linux-foundation.org,
torvalds@linux-foundation.org, linux-kernel@vger.kernel.org,
jason.low2@hp.com, hpa@zytor.com, jcmvbkbc@gmail.com,
paulmck@linux.vnet.ibm.com, peterz@infradead.org,
tglx@linutronix.de, davem@davemloft.net, mingo@kernel.org,
mhocko@suse.com, tony.luck@intel.com, chris@zankel.net
Subject: [tip:locking/rwsem] locking/rwsem: Get rid of __down_write_nested()
Date: Wed, 13 Apr 2016 04:32:13 -0700 [thread overview]
Message-ID: <tip-f8e04d854506ddfeba9cb41b601972b28521f104@git.kernel.org> (raw)
In-Reply-To: <1460041951-22347-2-git-send-email-mhocko@kernel.org>
Commit-ID: f8e04d854506ddfeba9cb41b601972b28521f104
Gitweb: http://git.kernel.org/tip/f8e04d854506ddfeba9cb41b601972b28521f104
Author: Michal Hocko <mhocko@suse.com>
AuthorDate: Thu, 7 Apr 2016 17:12:21 +0200
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 13 Apr 2016 10:42:16 +0200
locking/rwsem: Get rid of __down_write_nested()
This is no longer used anywhere and all callers (__down_write()) use
0 as a subclass. Ditch __down_write_nested() to make the code easier
to follow.
This shouldn't introduce any functional change.
Signed-off-by: Michal Hocko <mhocko@suse.com>
Acked-by: Davidlohr Bueso <dave@stgolabs.net>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Chris Zankel <chris@zankel.net>
Cc: David S. Miller <davem@davemloft.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
Cc: Signed-off-by: Jason Low <jason.low2@hp.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: linux-alpha@vger.kernel.org
Cc: linux-arch@vger.kernel.org
Cc: linux-ia64@vger.kernel.org
Cc: linux-s390@vger.kernel.org
Cc: linux-sh@vger.kernel.org
Cc: linux-xtensa@linux-xtensa.org
Cc: sparclinux@vger.kernel.org
Link: http://lkml.kernel.org/r/1460041951-22347-2-git-send-email-mhocko@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/s390/include/asm/rwsem.h | 7 +------
arch/sh/include/asm/rwsem.h | 5 -----
arch/sparc/include/asm/rwsem.h | 7 +------
arch/x86/include/asm/rwsem.h | 7 +------
include/asm-generic/rwsem.h | 7 +------
include/linux/rwsem-spinlock.h | 1 -
kernel/locking/rwsem-spinlock.c | 7 +------
7 files changed, 5 insertions(+), 36 deletions(-)
diff --git a/arch/s390/include/asm/rwsem.h b/arch/s390/include/asm/rwsem.h
index fead491..555d23b 100644
--- a/arch/s390/include/asm/rwsem.h
+++ b/arch/s390/include/asm/rwsem.h
@@ -90,7 +90,7 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
/*
* lock for writing
*/
-static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
+static inline void __down_write(struct rw_semaphore *sem)
{
signed long old, new, tmp;
@@ -108,11 +108,6 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
rwsem_down_write_failed(sem);
}
-static inline void __down_write(struct rw_semaphore *sem)
-{
- __down_write_nested(sem, 0);
-}
-
/*
* trylock for writing -- returns 1 if successful, 0 if contention
*/
diff --git a/arch/sh/include/asm/rwsem.h b/arch/sh/include/asm/rwsem.h
index edab572..a5104be 100644
--- a/arch/sh/include/asm/rwsem.h
+++ b/arch/sh/include/asm/rwsem.h
@@ -114,11 +114,6 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
rwsem_downgrade_wake(sem);
}
-static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
-{
- __down_write(sem);
-}
-
/*
* implement exchange and add functionality
*/
diff --git a/arch/sparc/include/asm/rwsem.h b/arch/sparc/include/asm/rwsem.h
index 069bf4d..e5a0d57 100644
--- a/arch/sparc/include/asm/rwsem.h
+++ b/arch/sparc/include/asm/rwsem.h
@@ -45,7 +45,7 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
/*
* lock for writing
*/
-static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
+static inline void __down_write(struct rw_semaphore *sem)
{
long tmp;
@@ -55,11 +55,6 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
rwsem_down_write_failed(sem);
}
-static inline void __down_write(struct rw_semaphore *sem)
-{
- __down_write_nested(sem, 0);
-}
-
static inline int __down_write_trylock(struct rw_semaphore *sem)
{
long tmp;
diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
index ceec86eb..4a8292a 100644
--- a/arch/x86/include/asm/rwsem.h
+++ b/arch/x86/include/asm/rwsem.h
@@ -99,7 +99,7 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
/*
* lock for writing
*/
-static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
+static inline void __down_write(struct rw_semaphore *sem)
{
long tmp;
asm volatile("# beginning down_write\n\t"
@@ -116,11 +116,6 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
: "memory", "cc");
}
-static inline void __down_write(struct rw_semaphore *sem)
-{
- __down_write_nested(sem, 0);
-}
-
/*
* trylock for writing -- returns 1 if successful, 0 if contention
*/
diff --git a/include/asm-generic/rwsem.h b/include/asm-generic/rwsem.h
index d6d5dc9..b8d8a6c 100644
--- a/include/asm-generic/rwsem.h
+++ b/include/asm-generic/rwsem.h
@@ -53,7 +53,7 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
/*
* lock for writing
*/
-static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
+static inline void __down_write(struct rw_semaphore *sem)
{
long tmp;
@@ -63,11 +63,6 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
rwsem_down_write_failed(sem);
}
-static inline void __down_write(struct rw_semaphore *sem)
-{
- __down_write_nested(sem, 0);
-}
-
static inline int __down_write_trylock(struct rw_semaphore *sem)
{
long tmp;
diff --git a/include/linux/rwsem-spinlock.h b/include/linux/rwsem-spinlock.h
index 561e861..a733a54 100644
--- a/include/linux/rwsem-spinlock.h
+++ b/include/linux/rwsem-spinlock.h
@@ -34,7 +34,6 @@ struct rw_semaphore {
extern void __down_read(struct rw_semaphore *sem);
extern int __down_read_trylock(struct rw_semaphore *sem);
extern void __down_write(struct rw_semaphore *sem);
-extern void __down_write_nested(struct rw_semaphore *sem, int subclass);
extern int __down_write_trylock(struct rw_semaphore *sem);
extern void __up_read(struct rw_semaphore *sem);
extern void __up_write(struct rw_semaphore *sem);
diff --git a/kernel/locking/rwsem-spinlock.c b/kernel/locking/rwsem-spinlock.c
index 3a50485..bab2610 100644
--- a/kernel/locking/rwsem-spinlock.c
+++ b/kernel/locking/rwsem-spinlock.c
@@ -191,7 +191,7 @@ int __down_read_trylock(struct rw_semaphore *sem)
/*
* get a write lock on the semaphore
*/
-void __sched __down_write_nested(struct rw_semaphore *sem, int subclass)
+void __sched __down_write(struct rw_semaphore *sem)
{
struct rwsem_waiter waiter;
struct task_struct *tsk;
@@ -227,11 +227,6 @@ void __sched __down_write_nested(struct rw_semaphore *sem, int subclass)
raw_spin_unlock_irqrestore(&sem->wait_lock, flags);
}
-void __sched __down_write(struct rw_semaphore *sem)
-{
- __down_write_nested(sem, 0);
-}
-
/*
* trylock for writing -- returns 1 if successful, 0 if contention
*/
next prev parent reply other threads:[~2016-04-13 11:34 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-07 15:12 [PATCH 0/11] introduce down_write_killable for rw_semaphore v3 Michal Hocko
2016-04-07 15:12 ` [PATCH 01/11] locking, rwsem: get rid of __down_write_nested Michal Hocko
2016-04-13 11:32 ` tip-bot for Michal Hocko [this message]
2016-04-07 15:12 ` [PATCH 02/11] locking, rwsem: drop explicit memory barriers Michal Hocko
2016-04-13 11:32 ` [tip:locking/rwsem] locking/rwsem: Drop " tip-bot for Michal Hocko
2016-04-07 15:12 ` [PATCH 03/11] xtensa, rwsem: drop superfluous arch specific implementation Michal Hocko
2016-04-13 11:33 ` [tip:locking/rwsem] locking/rwsem, xtensa: Drop " tip-bot for Michal Hocko
2016-04-07 15:12 ` [PATCH 04/11] sh, rwsem: drop " Michal Hocko
2016-04-13 11:33 ` [tip:locking/rwsem] locking/rwsem, sh: Drop " tip-bot for Michal Hocko
2016-04-07 15:12 ` [PATCH 05/11] sparc, rwsem: drop " Michal Hocko
2016-04-13 11:33 ` [tip:locking/rwsem] locking/rwsem, sparc: Drop " tip-bot for Michal Hocko
2016-04-07 15:12 ` [PATCH 06/11] locking, rwsem: introduce basis for down_write_killable Michal Hocko
2016-04-13 11:34 ` [tip:locking/rwsem] locking/rwsem: Introduce basis for down_write_killable() tip-bot for Michal Hocko
2016-04-07 15:12 ` [PATCH 07/11] alpha, rwsem: provide __down_write_killable Michal Hocko
2016-04-22 9:42 ` [tip:locking/rwsem] locking/rwsem, alpha: Provide __down_write_killable() tip-bot for Michal Hocko
2016-04-07 15:12 ` [PATCH 08/11] ia64, rwsem: provide __down_write_killable Michal Hocko
2016-04-07 17:28 ` Sergei Shtylyov
2016-04-08 6:22 ` Michal Hocko
2016-04-22 9:43 ` [tip:locking/rwsem] locking/rwsem, ia64: Provide __down_write_killable() tip-bot for Michal Hocko
2016-04-07 15:12 ` [PATCH 09/11] s390, rwsem: provide __down_write_killable Michal Hocko
2016-04-22 9:43 ` [tip:locking/rwsem] locking/rwsem, s390: Provide __down_write_killable() tip-bot for Michal Hocko
2016-04-07 15:12 ` [PATCH 10/11] x86, rwsem: provide __down_write_killable Michal Hocko
2016-04-13 9:08 ` Ingo Molnar
2016-04-13 9:16 ` Michal Hocko
2016-04-13 9:19 ` Ingo Molnar
2016-04-13 10:27 ` Ingo Molnar
2016-04-13 12:49 ` Michal Hocko
2016-04-17 16:59 ` Michal Hocko
2016-04-20 13:40 ` Peter Zijlstra
2016-04-20 18:04 ` H. Peter Anvin
2016-04-20 20:45 ` Borislav Petkov
2016-04-20 20:58 ` Michal Hocko
2016-04-20 21:06 ` H. Peter Anvin
2016-04-20 21:36 ` Borislav Petkov
2016-04-20 22:29 ` H. Peter Anvin
2016-04-21 11:35 ` Borislav Petkov
2016-04-21 13:09 ` Michal Hocko
2016-04-21 13:21 ` Borislav Petkov
2016-04-27 12:02 ` [PATCH] x86/locking/rwsem: Cleanup ____down_write() Borislav Petkov
2016-04-28 10:27 ` [tip:locking/rwsem] locking/rwsem, x86: Clean up ____down_write() tip-bot for Borislav Petkov
2016-04-22 6:53 ` [PATCH 10/11] x86, rwsem: provide __down_write_killable Ingo Molnar
2016-04-13 9:57 ` [PATCH] x86: add frame annotation for call_rwsem_down_write_failed_killable Michal Hocko
2016-04-22 9:44 ` [tip:locking/rwsem] locking/rwsem, x86: Add frame annotation for call_rwsem_down_write_failed_killable() tip-bot for Michal Hocko
2016-04-22 9:43 ` [tip:locking/rwsem] locking/rwsem, x86: Provide __down_write_killable() tip-bot for Michal Hocko
2016-04-07 15:12 ` [PATCH 11/11] locking, rwsem: provide down_write_killable Michal Hocko
2016-04-22 9:44 ` [tip:locking/rwsem] locking/rwsem: Provide down_write_killable() tip-bot for Michal Hocko
2016-04-12 9:37 ` [PATCH 0/11] introduce down_write_killable for rw_semaphore v3 Michal Hocko
2016-04-12 15:40 ` Peter Zijlstra
2016-04-12 18:01 ` Michal Hocko
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=tip-f8e04d854506ddfeba9cb41b601972b28521f104@git.kernel.org \
--to=tipbot@zytor.com \
--cc=akpm@linux-foundation.org \
--cc=chris@zankel.net \
--cc=dave@stgolabs.net \
--cc=davem@davemloft.net \
--cc=dbueso@suse.de \
--cc=hpa@zytor.com \
--cc=jason.low2@hp.com \
--cc=jcmvbkbc@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mhocko@suse.com \
--cc=mingo@kernel.org \
--cc=paulmck@linux.vnet.ibm.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=torvalds@linux-foundation.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
Powered by JetHome