Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a049c2d8 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

sunrpc: suppress warnings for unused procfs functions 



[ Upstream commit 1f7a4f98c11fbeb18ed21f3b3a497e90a50ad2e0 ]

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: dbf847ec ("knfsd: allow cache_register to return error on failure")
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Acked-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarAnna Schumaker <anna.schumaker@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 1c334629

net/sunrpc/cache.c

+3 −7
Original line number Diff line number Diff line
@@ -1652,12 +1652,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)
@@ -1685,12 +1687,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)

{