* [PATCH rcu 20/27] fs/notify: Remove "select SRCU"
[not found] <20230105003759.GA1769545@paulmck-ThinkPad-P17-Gen-1>
@ 2023-01-05 0:38 ` Paul E. McKenney
2023-01-05 11:30 ` Jan Kara
2023-01-05 0:38 ` [PATCH rcu 25/27] fs: Remove CONFIG_SRCU Paul E. McKenney
1 sibling, 1 reply; 3+ messages in thread
From: Paul E. McKenney @ 2023-01-05 0:38 UTC (permalink / raw)
To: rcu
Cc: linux-kernel, kernel-team, rostedt, Paul E. McKenney, Jan Kara,
Amir Goldstein, linux-fsdevel
Now that the SRCU Kconfig option is unconditionally selected, there is
no longer any point in selecting it. Therefore, remove the "select SRCU"
Kconfig statements.
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Cc: Jan Kara <jack@suse.cz>
Cc: Amir Goldstein <amir73il@gmail.com>
Cc: <linux-fsdevel@vger.kernel.org>
---
fs/notify/Kconfig | 1 -
1 file changed, 1 deletion(-)
diff --git a/fs/notify/Kconfig b/fs/notify/Kconfig
index c020d26ba223e..c6c72c90fd253 100644
--- a/fs/notify/Kconfig
+++ b/fs/notify/Kconfig
@@ -1,7 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-only
config FSNOTIFY
def_bool n
- select SRCU
source "fs/notify/dnotify/Kconfig"
source "fs/notify/inotify/Kconfig"
--
2.31.1.189.g2e36527f23
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH rcu 25/27] fs: Remove CONFIG_SRCU
[not found] <20230105003759.GA1769545@paulmck-ThinkPad-P17-Gen-1>
2023-01-05 0:38 ` [PATCH rcu 20/27] fs/notify: Remove "select SRCU" Paul E. McKenney
@ 2023-01-05 0:38 ` Paul E. McKenney
1 sibling, 0 replies; 3+ messages in thread
From: Paul E. McKenney @ 2023-01-05 0:38 UTC (permalink / raw)
To: rcu
Cc: linux-kernel, kernel-team, rostedt, Paul E. McKenney, Jeff Layton,
Chuck Lever, Alexander Viro, linux-fsdevel
Now that the SRCU Kconfig option is unconditionally selected, there is
no longer any point in conditional compilation based on CONFIG_SRCU.
Therefore, remove the #ifdef and throw away the #else clause.
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Cc: Jeff Layton <jlayton@kernel.org>
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: <linux-fsdevel@vger.kernel.org>
---
fs/locks.c | 25 -------------------------
1 file changed, 25 deletions(-)
diff --git a/fs/locks.c b/fs/locks.c
index 8f01bee177159..1909a9de242c8 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1889,7 +1889,6 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp,
}
EXPORT_SYMBOL(generic_setlease);
-#if IS_ENABLED(CONFIG_SRCU)
/*
* Kernel subsystems can register to be notified on any attempt to set
* a new lease with the lease_notifier_chain. This is used by (e.g.) nfsd
@@ -1923,30 +1922,6 @@ void lease_unregister_notifier(struct notifier_block *nb)
}
EXPORT_SYMBOL_GPL(lease_unregister_notifier);
-#else /* !IS_ENABLED(CONFIG_SRCU) */
-static inline void
-lease_notifier_chain_init(void)
-{
-}
-
-static inline void
-setlease_notifier(long arg, struct file_lock *lease)
-{
-}
-
-int lease_register_notifier(struct notifier_block *nb)
-{
- return 0;
-}
-EXPORT_SYMBOL_GPL(lease_register_notifier);
-
-void lease_unregister_notifier(struct notifier_block *nb)
-{
-}
-EXPORT_SYMBOL_GPL(lease_unregister_notifier);
-
-#endif /* IS_ENABLED(CONFIG_SRCU) */
-
/**
* vfs_setlease - sets a lease on an open file
* @filp: file pointer
--
2.31.1.189.g2e36527f23
^ permalink raw reply related [flat|nested] 3+ messages in thread