btrfs: use rb_find_add() in insert_block_entry()

Use the rb-tree helper so we don't open code the search and insert
code.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
Signed-off-by: Pan Chuang <panchuang@vivo.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/ref-verify.c b/fs/btrfs/ref-verify.c
index dd328382e64a9ca934c8ed35b34824b76b54e703..ceb155c4b237a28a2d6057f24b9166597a363357 100644 (file)
--- a/fs/btrfs/ref-verify.c
+++ b/fs/btrfs/ref-verify.c
@@ -88,27 +88,20 @@ static int block_entry_bytenr_key_cmp(const void *key, const struct rb_node *nod
        return 0;
 }
 
+static int block_entry_bytenr_cmp(struct rb_node *new, const struct rb_node *existing)
+{
+       const struct block_entry *new_entry = rb_entry(new, struct block_entry, node);
+
+       return block_entry_bytenr_key_cmp(&new_entry->bytenr, existing);
+}
+
 static struct block_entry *insert_block_entry(struct rb_root *root,
                                              struct block_entry *be)
 {
-       struct rb_node **p = &root->rb_node;
-       struct rb_node *parent_node = NULL;
-       struct block_entry *entry;
-
-       while (*p) {
-               parent_node = *p;
-               entry = rb_entry(parent_node, struct block_entry, node);
-               if (entry->bytenr > be->bytenr)
-                       p = &(*p)->rb_left;
-               else if (entry->bytenr < be->bytenr)
-                       p = &(*p)->rb_right;
-               else
-                       return entry;
-       }
+       struct rb_node *node;
 
-       rb_link_node(&be->node, parent_node, p);
-       rb_insert_color(&be->node, root);
-       return NULL;
+       node = rb_find_add(&be->node, root, block_entry_bytenr_cmp);
+       return rb_entry_safe(node, struct block_entry, node);
 }
 
 static struct block_entry *lookup_block_entry(struct rb_root *root, u64 bytenr)