Use the rb-tree helper so we don't open code the search and insert
code.
Signed-off-by: Pan Chuang <panchuang@vivo.com>
---
fs/btrfs/misc.h | 35 +++++++++++++++++------------------
1 file changed, 17 insertions(+), 18 deletions(-)
diff --git a/fs/btrfs/misc.h b/fs/btrfs/misc.h
index e28bca1b3de5..45fd64b18adf 100644
--- a/fs/btrfs/misc.h
+++ b/fs/btrfs/misc.h
@@ -119,28 +119,27 @@ static inline struct rb_node *rb_simple_search_first(const struct rb_root *root,
return ret;
}
-static inline struct rb_node *rb_simple_insert(struct rb_root *root,
- struct rb_simple_node *simple_node)
+static int rb_simple_node_bytenr_cmp(struct rb_node *new,
+ const struct rb_node *exist)
{
- struct rb_node **p = &root->rb_node;
- struct rb_node *parent = NULL;
- struct rb_simple_node *entry;
+ struct rb_simple_node *new_entry = rb_entry(new,
+ struct rb_simple_node, rb_node);
+ struct rb_simple_node *exist_entry = rb_entry(exist,
+ struct rb_simple_node, rb_node);
- while (*p) {
- parent = *p;
- entry = rb_entry(parent, struct rb_simple_node, rb_node);
+ if (new_entry->bytenr < exist_entry->bytenr)
+ return -1;
+ else if (new_entry->bytenr > exist_entry->bytenr)
+ return 1;
- if (simple_node->bytenr < entry->bytenr)
- p = &(*p)->rb_left;
- else if (simple_node->bytenr > entry->bytenr)
- p = &(*p)->rb_right;
- else
- return parent;
- }
+ return 0;
+}
- rb_link_node(&simple_node->rb_node, parent, p);
- rb_insert_color(&simple_node->rb_node, root);
- return NULL;
+static inline struct rb_node *rb_simple_insert(struct rb_root *root,
+ struct rb_simple_node *simple_node)
+{
+ return rb_find_add(&simple_node->rb_node, root,
+ rb_simple_node_bytenr_cmp);
}
static inline bool bitmap_test_range_all_set(const unsigned long *addr,
--
2.39.0