diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2014-11-13 18:11:22 +0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-11-13 15:13:05 -0500 |
commit | 7b4ce2353467fdab6e003be7a3129fb09b09deac (patch) | |
tree | 9e5d9d20cf30672d2db081a0de8604ad47680e49 /net/netfilter/nft_hash.c | |
parent | 1b2f309d70daf04b6a97b3753e375654532f6207 (diff) | |
download | linux-stable-7b4ce2353467fdab6e003be7a3129fb09b09deac.tar.gz linux-stable-7b4ce2353467fdab6e003be7a3129fb09b09deac.tar.bz2 linux-stable-7b4ce2353467fdab6e003be7a3129fb09b09deac.zip |
rhashtable: Add parent argument to mutex_is_held
Currently mutex_is_held can only test locks in the that are global
since it takes no arguments. This prevents rhashtable from being
used in places where locks are lock, e.g., per-namespace locks.
This patch adds a parent field to mutex_is_held and rhashtable_params
so that local locks can be used (and tested).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nft_hash.c')
-rw-r--r-- | net/netfilter/nft_hash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nft_hash.c b/net/netfilter/nft_hash.c index b86305c86048..3f75aaaf9d06 100644 --- a/net/netfilter/nft_hash.c +++ b/net/netfilter/nft_hash.c @@ -154,7 +154,7 @@ static unsigned int nft_hash_privsize(const struct nlattr * const nla[]) } #ifdef CONFIG_PROVE_LOCKING -static int lockdep_nfnl_lock_is_held(void) +static int lockdep_nfnl_lock_is_held(void *parent) { return lockdep_nfnl_is_held(NFNL_SUBSYS_NFTABLES); } |