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

Commit c91eee56 authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller
Browse files

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: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5300fdcb

include/linux/rhashtable.h

+0 −1
Original line number Diff line number Diff line
@@ -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) \

({ \

lib/rhashtable.c

+1 −7
Original line number Diff line number Diff line
@@ -38,16 +38,10 @@ int lockdep_rht_mutex_is_held(const struct rhashtable *ht) 
EXPORT_SYMBOL_GPL(lockdep_rht_mutex_is_held);

#endif



/**

 * 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;

}

EXPORT_SYMBOL_GPL(rht_obj);



static u32 __hashfn(const struct rhashtable *ht, const void *key,

		      u32 len, u32 hsize)