Commit a72e9d54 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Paul E. McKenney
Browse files

net: sched: Remove broken definitions and un-hide for !LOCKDEP 



Currently, variables used only within lockdep expressions are flagged as
unused, requiring that these variables' declarations be decorated with
either #ifdef or __maybe_unused.  This results in ugly code.  This commit
therefore causes the full definitions of the lockdep_tcf_chain_is_locked()
and lockdep_tcf_proto_is_locked() functions to be visible even when
lockdep is not enabled, thus removing the need for the previous empty
functions that were provided in non-lockdep kernels.  This approach
further relies on dead-code elimination to remove any references to
functions or variables that are not available in non-lockdep kernels.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
--
CC: jhs@mojatatu.com
CC: xiyou.wangcong@gmail.com
CC: jiri@resnulli.us
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent d97f3bdf

include/net/sch_generic.h

+0 −12
Original line number Diff line number Diff line
@@ -435,7 +435,6 @@ struct tcf_block { 
	struct mutex proto_destroy_lock; /* Lock for proto_destroy hashtable. */

};



#ifdef CONFIG_PROVE_LOCKING

static inline bool lockdep_tcf_chain_is_locked(struct tcf_chain *chain)

{

	return lockdep_is_held(&chain->filter_chain_lock);
@@ -445,17 +444,6 @@ static inline bool lockdep_tcf_proto_is_locked(struct tcf_proto *tp) 
{

	return lockdep_is_held(&tp->lock);

}

#else

static inline bool lockdep_tcf_chain_is_locked(struct tcf_block *chain)

{

	return true;

}



static inline bool lockdep_tcf_proto_is_locked(struct tcf_proto *tp)

{

	return true;

}

#endif /* #ifdef CONFIG_PROVE_LOCKING */



#define tcf_chain_dereference(p, chain)					\

	rcu_dereference_protected(p, lockdep_tcf_chain_is_locked(chain))