From 30f585f941673b59ddb9707d242ebeb5ecf96fa1 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Sun, 21 Mar 2010 18:03:11 -0700
Subject: [PATCH] --- yaml --- r: 188886 b: refs/heads/master c:
 e3a61d47cc37c51834abe537e0ed685829d56ee2 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv4/fib_trie.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3a21803177ad..bbf1fc555b8a 100644
--- 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
index af5d89792860..01ef8ba9025c 100644
--- 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;