From 99ef29cd665ca1ed056f32278faed60dbffa78f6 Mon Sep 17 00:00:00 2001
From: Nick Piggin <npiggin@suse.de>
Date: Tue, 6 Jan 2009 03:05:50 +0100
Subject: [PATCH] --- yaml --- r: 125757 b: refs/heads/master c:
 e8c82c2e23e3527e0c9dc195e432c16784d270fa h: refs/heads/master i:   125755:
 044df22acc6b92fc9c9582f48ff7907c263debd8 v: v3

---
 [refs]                           | 2 +-
 trunk/include/linux/radix-tree.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fb1187f9e812..86d67eed8990 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1b11e505463fd597ab7963df26dd1f446dcceae
+refs/heads/master: e8c82c2e23e3527e0c9dc195e432c16784d270fa
diff --git a/trunk/include/linux/radix-tree.h b/trunk/include/linux/radix-tree.h
index a916c6660dfa..355f6e80db0d 100644
--- a/trunk/include/linux/radix-tree.h
+++ b/trunk/include/linux/radix-tree.h
@@ -136,7 +136,7 @@ do {									\
  */
 static inline void *radix_tree_deref_slot(void **pslot)
 {
-	void *ret = *pslot;
+	void *ret = rcu_dereference(*pslot);
 	if (unlikely(radix_tree_is_indirect_ptr(ret)))
 		ret = RADIX_TREE_RETRY;
 	return ret;