diff options
| author | David S. Miller <davem@davemloft.net> | 2014-11-13 15:13:13 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-13 15:13:13 -0500 |
| commit | 9cf5476bfda3c2f1d5712d7bf09b3dad91fc2f2d (patch) | |
| tree | 9e5d9d20cf30672d2db081a0de8604ad47680e49 /include/linux | |
| parent | 9488e1e5b319751c71eebfd49027bf9e2377f38c (diff) | |
| parent | 7b4ce2353467fdab6e003be7a3129fb09b09deac (diff) | |
| download | talos-obmc-linux-9cf5476bfda3c2f1d5712d7bf09b3dad91fc2f2d.tar.gz talos-obmc-linux-9cf5476bfda3c2f1d5712d7bf09b3dad91fc2f2d.zip | |
Merge branch 'rhash_prove_locking'
Herbert Xu says:
====================
rhashtable: Allow local locks to be used and tested
This series moves mutex_is_held entirely under PROVE_LOCKING so
there is zero foot print when we're not debugging. More importantly
it adds a parrent argument to mutex_is_held so that we can test
local locks rather than global ones (e.g., per-namespace locks).
====================
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/rhashtable.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/rhashtable.h b/include/linux/rhashtable.h index fb298e9d6d3a..473e26bdb91d 100644 --- a/include/linux/rhashtable.h +++ b/include/linux/rhashtable.h @@ -65,7 +65,10 @@ struct rhashtable_params { size_t new_size); bool (*shrink_decision)(const struct rhashtable *ht, size_t new_size); - int (*mutex_is_held)(void); +#ifdef CONFIG_PROVE_LOCKING + int (*mutex_is_held)(void *parent); + void *parent; +#endif }; /** |
