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

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

rhashtable: fix annotations for rht_for_each_entry_rcu() 



Call rcu_deference_raw() directly from within rht_for_each_entry_rcu()
as list_for_each_entry_rcu() does.

Fixes the following sparse warnings:
net/netlink/af_netlink.c:2906:25:    expected struct rhash_head const *__mptr
net/netlink/af_netlink.c:2906:25:    got struct rhash_head [noderef] <asn:4>*<noident>

Fixes: e341694e ("netlink: Convert netlink_lookup() to use RCU protected hash table")
Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c91eee56

include/linux/rhashtable.h

+4 −8
Original line number Diff line number Diff line
@@ -123,11 +123,6 @@ void rhashtable_destroy(const struct rhashtable *ht); 
	typeof(ptr) __ptr = (ptr); \

	   __ptr ? rht_entry(__ptr, type, member) : NULL; \

})

#define rht_entry_safe_rcu(ptr, type, member) \

({ \

	typeof(*ptr) __rcu *__ptr = (typeof(*ptr) __rcu __force *)ptr; \

	__ptr ? container_of((typeof(ptr))rcu_dereference_raw(__ptr), type, member) : NULL; \

})



#define rht_next_entry_safe(pos, ht, member) \

({ \
@@ -204,9 +199,10 @@ void rhashtable_destroy(const struct rhashtable *ht); 
 * traversal is guarded by rcu_read_lock().

 */

#define rht_for_each_entry_rcu(pos, head, member) \

	for (pos = rht_entry_safe_rcu(head, typeof(*(pos)), member); \

	for (pos = rht_entry_safe(rcu_dereference_raw(head), \

				  typeof(*(pos)), member); \

	     pos; \

	     pos = rht_entry_safe_rcu((pos)->member.next, \

	     pos = rht_entry_safe(rcu_dereference_raw((pos)->member.next), \

				  typeof(*(pos)), member))



#endif /* _LINUX_RHASHTABLE_H */