---

yaml --- r: 168825 b: refs/heads/master c: b34df79 h: refs/heads/master i: 168823: 214ca9b v: v3
git-mirror · Nov 19, 2009 · ad45b18 · ad45b18
1 parent 0293324
commit ad45b18
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e311a207d596b9273d811149d6e3e14f05ac4c0
+refs/heads/master: b34df792b4e9e311db47fad27949095d0629c197
diff --git a/trunk/fs/fscache/cookie.c b/trunk/fs/fscache/cookie.c
@@ -102,7 +102,9 @@ struct fscache_cookie *__fscache_acquire_cookie(
 	cookie->netfs_data	= netfs_data;
 	cookie->flags		= 0;
 
-	INIT_RADIX_TREE(&cookie->stores, GFP_NOFS);
+	/* radix tree insertion won't use the preallocation pool unless it's
+	 * told it may not wait */
+	INIT_RADIX_TREE(&cookie->stores, GFP_NOFS & ~__GFP_WAIT);
 
 	switch (cookie->def->type) {
 	case FSCACHE_COOKIE_TYPE_INDEX:

diff --git a/trunk/lib/radix-tree.c b/trunk/lib/radix-tree.c
@@ -200,6 +200,9 @@ radix_tree_node_free(struct radix_tree_node *node)
  * ensure that the addition of a single element in the tree cannot fail.  On
  * success, return zero, with preemption disabled.  On error, return -ENOMEM
  * with preemption not disabled.
+ *
+ * To make use of this facility, the radix tree must be initialised without
+ * __GFP_WAIT being passed to INIT_RADIX_TREE().
  */
 int radix_tree_preload(gfp_t gfp_mask)
 {