diff options
| -rw-r--r-- | include/linux/rhashtable.h | 1 | ||||
| -rw-r--r-- | lib/rhashtable.c | 8 |
2 files changed, 1 insertions, 8 deletions
diff --git a/include/linux/rhashtable.h b/include/linux/rhashtable.h index 8c6048e77f29..af967c4c7591 100644 --- a/include/linux/rhashtable.h +++ b/include/linux/rhashtable.h | |||
| @@ -117,7 +117,6 @@ void rhashtable_destroy(const struct rhashtable *ht); | |||
| 117 | #define rht_dereference_rcu(p, ht) \ | 117 | #define rht_dereference_rcu(p, ht) \ |
| 118 | rcu_dereference_check(p, lockdep_rht_mutex_is_held(ht)) | 118 | rcu_dereference_check(p, lockdep_rht_mutex_is_held(ht)) |
| 119 | 119 | ||
| 120 | /* Internal, use rht_obj() instead */ | ||
| 121 | #define rht_entry(ptr, type, member) container_of(ptr, type, member) | 120 | #define rht_entry(ptr, type, member) container_of(ptr, type, member) |
| 122 | #define rht_entry_safe(ptr, type, member) \ | 121 | #define rht_entry_safe(ptr, type, member) \ |
| 123 | ({ \ | 122 | ({ \ |
diff --git a/lib/rhashtable.c b/lib/rhashtable.c index 338dd7aa5e13..a2c78810ebc1 100644 --- a/lib/rhashtable.c +++ b/lib/rhashtable.c | |||
| @@ -38,16 +38,10 @@ int lockdep_rht_mutex_is_held(const struct rhashtable *ht) | |||
| 38 | EXPORT_SYMBOL_GPL(lockdep_rht_mutex_is_held); | 38 | EXPORT_SYMBOL_GPL(lockdep_rht_mutex_is_held); |
| 39 | #endif | 39 | #endif |
| 40 | 40 | ||
| 41 | /** | 41 | static void *rht_obj(const struct rhashtable *ht, const struct rhash_head *he) |
| 42 | * rht_obj - cast hash head to outer object | ||
| 43 | * @ht: hash table | ||
| 44 | * @he: hashed node | ||
| 45 | */ | ||
| 46 | void *rht_obj(const struct rhashtable *ht, const struct rhash_head *he) | ||
| 47 | { | 42 | { |
| 48 | return (void *) he - ht->p.head_offset; | 43 | return (void *) he - ht->p.head_offset; |
| 49 | } | 44 | } |
| 50 | EXPORT_SYMBOL_GPL(rht_obj); | ||
| 51 | 45 | ||
| 52 | static u32 __hashfn(const struct rhashtable *ht, const void *key, | 46 | static u32 __hashfn(const struct rhashtable *ht, const void *key, |
| 53 | u32 len, u32 hsize) | 47 | u32 len, u32 hsize) |
