On Fri, Jun 21, 2013 at 08:42:55AM +0200, Clemens Eisserer wrote:
> Hi Jon,
>
> > Is this what you are looking for?
> > After this, the CPU gets "stuck" and I have to reboot.
>
> This issue has already been reported:
> https://bugzilla.kernel.org/show_bug.cgi?id=59451
Hi,
Could you please try this patch?
(at least it addresses my ulist_add_merge crash :))
thanks,
liubo
diff --git a/fs/btrfs/ulist.c b/fs/btrfs/ulist.c
index 7b417e2..69a9c32 100644
--- a/fs/btrfs/ulist.c
+++ b/fs/btrfs/ulist.c
@@ -73,7 +73,6 @@ void ulist_fini(struct ulist *ulist)
if (ulist->nodes_alloced > ULIST_SIZE)
kfree(ulist->nodes);
ulist->nodes_alloced = 0; /* in case ulist_fini is called twice */
- ulist->root = RB_ROOT;
}
EXPORT_SYMBOL(ulist_fini);
@@ -205,6 +204,7 @@ int ulist_add_merge(struct ulist *ulist, u64 val, u64 aux,
u64 new_alloced = ulist->nodes_alloced + 128;
struct ulist_node *new_nodes;
void *old = NULL;
+ int i;
/*
* if nodes_alloced == ULIST_SIZE no memory has been allocated
@@ -222,6 +222,17 @@ int ulist_add_merge(struct ulist *ulist, u64 val, u64 aux,
memcpy(new_nodes, ulist->int_nodes,
sizeof(ulist->int_nodes));
+ /*
+ * krealloc actually uses memcpy, which does not copy rb_node
+ * pointers, so we have to do it ourselves. Otherwise we may
+ * be bitten by crashes.
+ */
+ for (i = 0; i < ulist->nnodes; i++) {
+ rb_erase(&ulist->nodes[i].rb_node, &ulist->root);
+ ret = ulist_rbtree_insert(ulist, &new_nodes[i]);
+ BUG_ON(ret);
+ }
+
ulist->nodes = new_nodes;
ulist->nodes_alloced = new_alloced;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
