---

yaml --- r: 190017 b: refs/heads/master c: 4eaa0e3 h: refs/heads/master i: 190015: 26aae71 v: v3
git-mirror · Apr 14, 2010 · c24fbbf · c24fbbf
1 parent c7fd0ad
commit c24fbbf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0110d6f22f392f976e84ab49da1b42f85b64a3c5
+refs/heads/master: 4eaa0e3c869acd5dbc7c2e3818a9ae9cbf221d27
diff --git a/trunk/net/ipv4/fib_trie.c b/trunk/net/ipv4/fib_trie.c
@@ -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)