The patch titled
more fixes for RCU radix-tree
has been removed from the -mm tree. Its filename is
adix-tree-rcu-lockless-readside-fix-2.patch
This patch was dropped because it was folded into radix-tree-rcu-lockless-readside.patch
------------------------------------------------------
Subject: more fixes for RCU radix-tree
From: Nick Piggin <npiggin@xxxxxxx>
Couple more silly bugs caught by the rtth.
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
lib/radix-tree.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff -puN lib/radix-tree.c~adix-tree-rcu-lockless-readside-fix-2 lib/radix-tree.c
--- a/lib/radix-tree.c~adix-tree-rcu-lockless-readside-fix-2
+++ a/lib/radix-tree.c
@@ -624,6 +624,8 @@ __lookup(struct radix_tree_node *slot, v
shift -= RADIX_TREE_MAP_SHIFT;
slot = rcu_dereference(slot->slots[i]);
+ if (slot == NULL)
+ goto out;
}
/* Bottom level: grab some items */
@@ -925,10 +927,14 @@ void *radix_tree_delete(struct radix_tre
to_free = NULL;
/* Now free the nodes we do not need anymore */
while (pathp->node) {
- if (to_free)
- radix_tree_node_free(to_free);
pathp->node->slots[pathp->offset] = NULL;
pathp->node->count--;
+ /*
+ * Queue the node for deferred freeing after the
+ * last reference to it disappears (set NULL, above).
+ */
+ if (to_free)
+ radix_tree_node_free(to_free);
if (pathp->node->count) {
if (pathp->node == root->rnode)
_
Patches currently in -mm which might be from npiggin@xxxxxxx are
git-block.patch
mm-vm_bug_on.patch
radix-tree-rcu-lockless-readside.patch
adix-tree-rcu-lockless-readside-fix-2.patch
mm-remove_mapping-safeness.patch
mm-non-syncing-lock_page.patch
oom-use-unreclaimable-info.patch
oom-reclaim_mapped-on-oom.patch
oom-cpuset-hint.patch
oom-handle-current-exiting.patch
oom-handle-oom_disable-exiting.patch
oom-swapoff-tasks-tweak.patch
oom-kthread-infinite-loop-fix.patch
oom-more-printk.patch
update-some-mm-comments.patch
page-invalidation-cleanup.patch
mm-micro-optimise-zone_watermark_ok.patch
select_bad_process-cleanup-releasing-check.patch
oom-dont-kill-current-when-another-oom-in-progress.patch
sched-force-sbin-init-off-isolated-cpus.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
