Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <2060f8d47dd0fd1999733b87b1919f6642b6e9e1.camel@kernel.org>
Subject: Re: [PATCH rcu v2 09/20] fs: Remove CONFIG_SRCU
From:   Jeff Layton <jlayton@kernel.org>
To:     "Paul E. McKenney" <paulmck@kernel.org>, rcu@vger.kernel.org
Cc:     linux-kernel@vger.kernel.org, kernel-team@meta.com,
        rostedt@goodmis.org, Chuck Lever <chuck.lever@oracle.com>,
        Alexander Viro <viro@zeniv.linux.org.uk>,
        linux-fsdevel@vger.kernel.org,
        John Ogness <john.ogness@linutronix.de>
Date:   Thu, 12 Jan 2023 20:03:48 -0500
In-Reply-To: <20230113001132.3375334-9-paulmck@kernel.org>
References: <20230113001103.GA3374173@paulmck-ThinkPad-P17-Gen-1>
         <20230113001132.3375334-9-paulmck@kernel.org>
Content-Type: text/plain; charset="ISO-8859-15"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.46.3 (3.46.3-1.fc37) 
MIME-Version: 1.0
Precedence: bulk

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.
>=20
> 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(-)
>=20
> 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, s=
truct file_lock **flp,
>  }
>  EXPORT_SYMBOL(generic_setlease);
> =20
> -#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.) nfs=
d
> @@ -1923,30 +1922,6 @@ void lease_unregister_notifier(struct notifier_blo=
ck *nb)
>  }
>  EXPORT_SYMBOL_GPL(lease_unregister_notifier);
> =20
> -#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>