---

yaml --- r: 188882 b: refs/heads/master c: 634a4b2 h: refs/heads/master v: v3
git-mirror · Mar 22, 2010 · 88b47a0 · 88b47a0
1 parent 0bb4c87
commit 88b47a0
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: af98441397227a5a4f212cd48710eea72a14dbdb
+refs/heads/master: 634a4b2038a6eba4c211fb906fa2f6ec9a4bbfc7
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;