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

Commit 1f501d62 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

netfilter: Move mutex_is_held under PROVE_LOCKING 



The rhashtable function mutex_is_held is only used when PROVE_LOCKING
is enabled.  This patch modifies netfilter so that we can rhashtable.h
itself can later make mutex_is_held optional depending on PROVE_LOCKING.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 97127566

net/netfilter/nft_hash.c

+4 −0
Original line number Diff line number Diff line
@@ -153,10 +153,12 @@ static unsigned int nft_hash_privsize(const struct nlattr * const nla[]) 
	return sizeof(struct rhashtable);

}



#ifdef CONFIG_PROVE_LOCKING

static int lockdep_nfnl_lock_is_held(void)

{

	return lockdep_nfnl_is_held(NFNL_SUBSYS_NFTABLES);

}

#endif



static int nft_hash_init(const struct nft_set *set,

			 const struct nft_set_desc *desc,
@@ -171,7 +173,9 @@ static int nft_hash_init(const struct nft_set *set, 
		.hashfn = jhash,

		.grow_decision = rht_grow_above_75,

		.shrink_decision = rht_shrink_below_30,

#ifdef CONFIG_PROVE_LOCKING

		.mutex_is_held = lockdep_nfnl_lock_is_held,

#endif

	};



	return rhashtable_init(priv, &params);