Commit a1115570 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Paul E. McKenney
Browse files

radix-tree: __rcu annotations 



Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Nick Piggin <npiggin@suse.de>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
parent 374a8e0d

include/linux/radix-tree.h

+3 −1
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ static inline void *radix_tree_indirect_to_ptr(void *ptr) 
{

	return (void *)((unsigned long)ptr & ~RADIX_TREE_INDIRECT_PTR);

}

#define radix_tree_indirect_to_ptr(ptr) \

	radix_tree_indirect_to_ptr((void __force *)(ptr))



static inline int radix_tree_is_indirect_ptr(void *ptr)

{
@@ -61,7 +63,7 @@ static inline int radix_tree_is_indirect_ptr(void *ptr) 
struct radix_tree_root {

	unsigned int		height;

	gfp_t			gfp_mask;

	struct radix_tree_node	*rnode;

	struct radix_tree_node	__rcu *rnode;

};



#define RADIX_TREE_INIT(mask)	{					\

lib/radix-tree.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ struct radix_tree_node { 
	unsigned int	height;		/* Height from the bottom */

	unsigned int	count;

	struct rcu_head	rcu_head;

	void		*slots[RADIX_TREE_MAP_SIZE];

	void __rcu	*slots[RADIX_TREE_MAP_SIZE];

	unsigned long	tags[RADIX_TREE_MAX_TAGS][RADIX_TREE_TAG_LONGS];

};