From cdb9e22e292275237cbd93b9c4326382daff70f1 Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Fri, 10 Oct 2014 16:57:08 -0400 Subject: Btrfs-progs: break out rbtree util functions These were added to deal with duplicated functionality within btrfs-progs, but we specifically copied rbtree.c from the kernel, so move these functions out into their own file. This will make it easier to keep rbtree.c in sync. Thanks, Signed-off-by: Josef Bacik Signed-off-by: David Sterba --- rbtree.c | 63 --------------------------------------------------------------- 1 file changed, 63 deletions(-) (limited to 'rbtree.c') diff --git a/rbtree.c b/rbtree.c index 4c06b0c8..6ad800fd 100644 --- a/rbtree.c +++ b/rbtree.c @@ -387,66 +387,3 @@ void rb_replace_node(struct rb_node *victim, struct rb_node *new, /* Copy the pointers/colour from the victim to the replacement */ *new = *victim; } - -int rb_insert(struct rb_root *root, struct rb_node *node, - rb_compare_nodes comp) -{ - struct rb_node **p = &root->rb_node; - struct rb_node *parent = NULL; - int ret; - - while(*p) { - parent = *p; - - ret = comp(parent, node); - if (ret < 0) - p = &(*p)->rb_left; - else if (ret > 0) - p = &(*p)->rb_right; - else - return -EEXIST; - } - - rb_link_node(node, parent, p); - rb_insert_color(node, root); - return 0; -} - -struct rb_node *rb_search(struct rb_root *root, void *key, rb_compare_keys comp, - struct rb_node **next_ret) -{ - struct rb_node *n = root->rb_node; - struct rb_node *parent = NULL; - int ret = 0; - - while(n) { - parent = n; - - ret = comp(n, key); - if (ret < 0) - n = n->rb_left; - else if (ret > 0) - n = n->rb_right; - else - return n; - } - - if (!next_ret) - return NULL; - - if (parent && ret > 0) - parent = rb_next(parent); - - *next_ret = parent; - return NULL; -} - -void rb_free_nodes(struct rb_root *root, rb_free_node free_node) -{ - struct rb_node *node; - - while ((node = rb_first(root))) { - rb_erase(node, root); - free_node(node); - } -} -- cgit v1.2.3