mirror of
https://github.com/torvalds/linux.git
synced 2026-05-29 17:43:52 +02:00
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>
This commit is contained in:
parent
9734685854
commit
c4f38e7ca5
|
|
@ -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;
|
||||
struct rb_node *node;
|
||||
|
||||
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;
|
||||
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)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user