[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <Zg1XkUMOjE0UmLYI@tissot.1015granger.net>
Date: Wed, 3 Apr 2024 09:20:17 -0400
From: Chuck Lever <chuck.lever@...cle.com>
To: Arnd Bergmann <arnd@...nel.org>
Cc: "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
Trond Myklebust <trond.myklebust@...merspace.com>,
Anna Schumaker <anna@...nel.org>, Jeff Layton <jlayton@...nel.org>,
"David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>, Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>, NeilBrown <neilb@...e.de>,
"J. Bruce Fields" <bfields@...ldses.org>,
Arnd Bergmann <arnd@...db.de>, Olga Kornievskaia <kolga@...app.com>,
Dai Ngo <dai.ngo@...cle.com>, Tom Talpey <tom@...pey.com>,
"linux-nfs@...r.kernel.org" <linux-nfs@...r.kernel.org>,
"netdev@...r.kernel.org" <netdev@...r.kernel.org>
Subject: Re: [PATCH 19/34] sunrpc: suppress warnings for unused procfs
functions
On Wed, Apr 03, 2024 at 04:06:37AM -0400, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@...db.de>
>
> There is a warning about unused variables when building with W=1 and no procfs:
>
> net/sunrpc/cache.c:1660:30: error: 'cache_flush_proc_ops' defined but not used [-Werror=unused-const-variable=]
> 1660 | static const struct proc_ops cache_flush_proc_ops = {
> | ^~~~~~~~~~~~~~~~~~~~
> net/sunrpc/cache.c:1622:30: error: 'content_proc_ops' defined but not used [-Werror=unused-const-variable=]
> 1622 | static const struct proc_ops content_proc_ops = {
> | ^~~~~~~~~~~~~~~~
> net/sunrpc/cache.c:1598:30: error: 'cache_channel_proc_ops' defined but not used [-Werror=unused-const-variable=]
> 1598 | static const struct proc_ops cache_channel_proc_ops = {
> | ^~~~~~~~~~~~~~~~~~~~~~
>
> These are used inside of an #ifdef, so replacing that with an
> IS_ENABLED() check lets the compiler see how they are used while
> still dropping them during dead code elimination.
>
> Fixes: dbf847ecb631 ("knfsd: allow cache_register to return error on failure")
> Signed-off-by: Arnd Bergmann <arnd@...db.de>
Acked-by: Chuck Lever <chuck.lever@...cle.com>
> ---
> net/sunrpc/cache.c | 10 +++-------
> 1 file changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
> index 95ff74706104..ab3a57965dc0 100644
> --- a/net/sunrpc/cache.c
> +++ b/net/sunrpc/cache.c
> @@ -1673,12 +1673,14 @@ static void remove_cache_proc_entries(struct cache_detail *cd)
> }
> }
>
> -#ifdef CONFIG_PROC_FS
> static int create_cache_proc_entries(struct cache_detail *cd, struct net *net)
> {
> struct proc_dir_entry *p;
> struct sunrpc_net *sn;
>
> + if (!IS_ENABLED(CONFIG_PROC_FS))
> + return 0;
> +
> sn = net_generic(net, sunrpc_net_id);
> cd->procfs = proc_mkdir(cd->name, sn->proc_net_rpc);
> if (cd->procfs == NULL)
> @@ -1706,12 +1708,6 @@ static int create_cache_proc_entries(struct cache_detail *cd, struct net *net)
> remove_cache_proc_entries(cd);
> return -ENOMEM;
> }
> -#else /* CONFIG_PROC_FS */
> -static int create_cache_proc_entries(struct cache_detail *cd, struct net *net)
> -{
> - return 0;
> -}
> -#endif
>
> void __init cache_initialize(void)
> {
> --
> 2.39.2
>
--
Chuck Lever
Powered by blists - more mailing lists