---

yaml --- r: 188886 b: refs/heads/master c: e3a61d4 h: refs/heads/master v: v3
git-mirror · Mar 22, 2010 · 30f585f · 30f585f
1 parent 17421e4
commit 30f585f
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: c2c77ec83bdad17fb688557b5b3fdc36661dd1c6
+refs/heads/master: e3a61d47cc37c51834abe537e0ed685829d56ee2
diff --git a/trunk/net/ipv4/fib_trie.c b/trunk/net/ipv4/fib_trie.c
@@ -961,7 +961,9 @@ fib_find_node(struct trie *t, u32 key)
 	struct node *n;
 
 	pos = 0;
-	n = rcu_dereference(t->trie);
+	n = rcu_dereference_check(t->trie,
+				  rcu_read_lock_held() ||
+				  lockdep_rtnl_is_held());
 
 	while (n != NULL &&  NODE_TYPE(n) == T_TNODE) {
 		tn = (struct tnode *) n;