Skip to content

Commit

Permalink
fib: suppress lockdep-RCU false positive in FIB trie.
Browse files Browse the repository at this point in the history
Followup of commit 634a4b2

Allow tnode_get_child_rcu() to be called either under rcu_read_lock()
protection or with RTNL held.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Eric Dumazet authored and davem330 committed Apr 14, 2010
1 parent 0110d6f commit 4eaa0e3
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion net/ipv4/fib_trie.c
Expand Up @@ -209,7 +209,9 @@ static inline struct node *tnode_get_child_rcu(struct tnode *tn, unsigned int i)
{
struct node *ret = tnode_get_child(tn, i);

return rcu_dereference(ret);
return rcu_dereference_check(ret,
rcu_read_lock_held() ||
lockdep_rtnl_is_held());
}

static inline int tnode_child_length(const struct tnode *tn)
Expand Down

0 comments on commit 4eaa0e3

Please sign in to comment.