Here we are not going to free memory, no need to remove every node
one by one, just init root node here is ok.

Cc:  Liu Bo <bo.li....@oracle.com>
Signed-off-by: Wang Shilong <wangsl.f...@cn.fujitsu.com>
---
 fs/btrfs/ulist.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/fs/btrfs/ulist.c b/fs/btrfs/ulist.c
index b0a523b2..35f5de9 100644
--- a/fs/btrfs/ulist.c
+++ b/fs/btrfs/ulist.c
@@ -207,9 +207,6 @@ int ulist_add_merge(struct ulist *ulist, u64 val, u64 aux,
                void *old = NULL;
                int i;
 
-               for (i = 0; i < ulist->nnodes; i++)
-                       rb_erase(&ulist->nodes[i].rb_node, &ulist->root);
-
                /*
                 * if nodes_alloced == ULIST_SIZE no memory has been allocated
                 * yet, so pass NULL to krealloc
@@ -234,6 +231,7 @@ int ulist_add_merge(struct ulist *ulist, u64 val, u64 aux,
                 * pointers, so we have to do it ourselves.  Otherwise we may
                 * be bitten by crashes.
                 */
+               ulist->root = RB_ROOT;
                for (i = 0; i < ulist->nnodes; i++) {
                        ret = ulist_rbtree_insert(ulist, &ulist->nodes[i]);
                        if (ret < 0)
-- 
1.8.3.1

--
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

Reply via email to