diff options
authorThomas Graf <tgraf@suug.ch>2014-08-13 16:38:30 +0200
committerDavid S. Miller <davem@davemloft.net>2014-08-14 15:13:39 -0700
commitc91eee56dc4f8c3d9ae834bacb835596d47a709e (patch)
parent5300fdcb7b7e97d83033bc7196582705524d35ea (diff)
rhashtable: unexport and make rht_obj() static
No need to export rht_obj(), all inner to outer object translations occur internally. It was intended to be used with rht_for_each() which now primarily serves as the iterator for rhashtable_remove_pprev() to effectively flush and free the full table. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
2 files changed, 1 insertions, 8 deletions
diff --git a/include/linux/rhashtable.h b/include/linux/rhashtable.h
index 8c6048e77f2..af967c4c759 100644
--- a/include/linux/rhashtable.h
+++ b/include/linux/rhashtable.h
@@ -117,7 +117,6 @@ void rhashtable_destroy(const struct rhashtable *ht);
#define rht_dereference_rcu(p, ht) \
rcu_dereference_check(p, lockdep_rht_mutex_is_held(ht))
-/* Internal, use rht_obj() instead */
#define rht_entry(ptr, type, member) container_of(ptr, type, member)
#define rht_entry_safe(ptr, type, member) \
({ \
diff --git a/lib/rhashtable.c b/lib/rhashtable.c
index 338dd7aa5e1..a2c78810ebc 100644
--- a/lib/rhashtable.c
+++ b/lib/rhashtable.c
@@ -38,16 +38,10 @@ int lockdep_rht_mutex_is_held(const struct rhashtable *ht)
- * rht_obj - cast hash head to outer object
- * @ht: hash table
- * @he: hashed node
- */
-void *rht_obj(const struct rhashtable *ht, const struct rhash_head *he)
+static void *rht_obj(const struct rhashtable *ht, const struct rhash_head *he)
return (void *) he - ht->p.head_offset;
static u32 __hashfn(const struct rhashtable *ht, const void *key,
u32 len, u32 hsize)