---

yaml --- r: 125757 b: refs/heads/master c: e8c82c2 h: refs/heads/master i: 125755: 044df22 v: v3
git-mirror · Jan 6, 2009 · 99ef29c · 99ef29c
1 parent 331ff16
commit 99ef29c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;