[PATCH rcu v2 09/20] fs: Remove CONFIG_SRCU

[PATCH rcu v2 09/20] fs: Remove CONFIG_SRCU

[Paul E. McKenney]

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>
Reviewed-by: John Ogness <john.ogness@linutronix.de>
---
 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

[PATCH rcu v2 12/20] fs/notify: Remove "select SRCU"

[Paul E. McKenney]

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>
Acked-by: Jan Kara <jack@suse.cz>
Reviewed-by: John Ogness <john.ogness@linutronix.de>
---
 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

Re: [PATCH rcu v2 09/20] fs: Remove CONFIG_SRCU

[Jeff Layton]

On Thu, 2023-01-12 at 16:11 -0800, Paul E. McKenney wrote:
> 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>
> Reviewed-by: John Ogness <john.ogness@linutronix.de>
> ---
>  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

Reviewed-by: Jeff Layton <jlayton@kernel.org>

Re: [PATCH rcu v2 09/20] fs: Remove CONFIG_SRCU

[Paul E. McKenney]

On Thu, Jan 12, 2023 at 08:03:48PM -0500, Jeff Layton wrote:
> On Thu, 2023-01-12 at 16:11 -0800, Paul E. McKenney wrote:
> > 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>
> > Reviewed-by: John Ogness <john.ogness@linutronix.de>
> > ---
> >  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
> 
> Reviewed-by: Jeff Layton <jlayton@kernel.org>

Thank you!  I will apply this on my next rebase.

							Thanx, Paul