[3/3] netfilter: nfnetlink: silence warning if CONFIG_PROVE_RCU isn't set

Message ID 1362654002-4405-4-git-send-email-pablo@netfilter.org
State Accepted
Headers show

Commit Message

Pablo Neira Ayuso March 7, 2013, 11 a.m.
From: Paul Bolle <pebolle@tiscali.nl>

Since commit c14b78e7decd0d1d5add6a4604feb8609fe920a9 ("netfilter:
nfnetlink: add mutex per subsystem") building nefnetlink.o without
CONFIG_PROVE_RCU set, triggers this GCC warning:
    net/netfilter/nfnetlink.c:65:22: warning: ‘nfnl_get_lock’ defined but not used [-Wunused-function]

The cause of that warning is, in short, that rcu_lockdep_assert()
compiles away if CONFIG_PROVE_RCU is not set. Silence this warning by
open coding nfnl_get_lock() in the sole place it was called, which
allows to remove that function.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
 net/netfilter/nfnetlink.c |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)


diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
index d578ec2..0b1b32c 100644
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@ -62,11 +62,6 @@  void nfnl_unlock(__u8 subsys_id)
-static struct mutex *nfnl_get_lock(__u8 subsys_id)
-	return &table[subsys_id].mutex;
 int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n)
@@ -199,7 +194,7 @@  replay:
 			if (rcu_dereference_protected(table[subsys_id].subsys,
-				lockdep_is_held(nfnl_get_lock(subsys_id))) != ss ||
+				lockdep_is_held(&table[subsys_id].mutex)) != ss ||
 			    nfnetlink_find_client(type, ss) != nc)
 				err = -EAGAIN;
 			else if (nc->call)