btrfs: use rb_find() in ulist_rbtree_search()

Use the rb-tree helper so we don't open code the search 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/ulist.c b/fs/btrfs/ulist.c
index fc59b57257d6715b143a819a72a7eef9d9f9fe1d..c3127ed0e35d05e364b155cf806add84d36a78f4 100644 (file)
--- a/fs/btrfs/ulist.c
+++ b/fs/btrfs/ulist.c
@@ -129,21 +129,25 @@ void ulist_free(struct ulist *ulist)
        kfree(ulist);
 }
 
+static int ulist_node_val_key_cmp(const void *key, const struct rb_node *node)
+{
+       const u64 *val = key;
+       const struct ulist_node *unode = rb_entry(node, struct ulist_node, rb_node);
+
+       if (unode->val < *val)
+               return 1;
+       else if (unode->val > *val)
+               return -1;
+
+       return 0;
+}
+
 static struct ulist_node *ulist_rbtree_search(struct ulist *ulist, u64 val)
 {
-       struct rb_node *n = ulist->root.rb_node;
-       struct ulist_node *u = NULL;
-
-       while (n) {
-               u = rb_entry(n, struct ulist_node, rb_node);
-               if (u->val < val)
-                       n = n->rb_right;
-               else if (u->val > val)
-                       n = n->rb_left;
-               else
-                       return u;
-       }
-       return NULL;
+       struct rb_node *node;
+
+       node = rb_find(&val, &ulist->root, ulist_node_val_key_cmp);
+       return rb_entry_safe(node, struct ulist_node, rb_node);
 }
 
 static void ulist_rbtree_erase(struct ulist *ulist, struct ulist_node *node)