Commit c6e3ae8a authored by Yangtao Li's avatar Yangtao Li Committed by David Sterba
Browse files

btrfs: use rb_find_add() in insert_root_entry() 



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

Signed-off-by: default avatarYangtao Li <frank.li@vivo.com>
Signed-off-by: default avatarPan Chuang <panchuang@vivo.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent afaa9f82

fs/btrfs/ref-verify.c

+10 −18
Original line number Diff line number Diff line
@@ -125,28 +125,20 @@ static int root_entry_root_objectid_key_cmp(const void *key, const struct rb_nod 
	return 0;

}



static struct root_entry *insert_root_entry(struct rb_root *root,

					    struct root_entry *re)

static int root_entry_root_objectid_cmp(struct rb_node *new, const struct rb_node *existing)

{

	struct rb_node **p = &root->rb_node;

	struct rb_node *parent_node = NULL;

	struct root_entry *entry;

	const struct root_entry *new_entry = rb_entry(new, struct root_entry, node);



	while (*p) {

		parent_node = *p;

		entry = rb_entry(parent_node, struct root_entry, node);

		if (entry->root_objectid > re->root_objectid)

			p = &(*p)->rb_left;

		else if (entry->root_objectid < re->root_objectid)

			p = &(*p)->rb_right;

		else

			return entry;

	return root_entry_root_objectid_key_cmp(&new_entry->root_objectid, existing);

}



	rb_link_node(&re->node, parent_node, p);

	rb_insert_color(&re->node, root);

	return NULL;

static struct root_entry *insert_root_entry(struct rb_root *root,

					    struct root_entry *re)

{

	struct rb_node *node;



	node = rb_find_add(&re->node, root, root_entry_root_objectid_cmp);

	return rb_entry_safe(node, struct root_entry, node);

}



static int comp_refs(struct ref_entry *ref1, struct ref_entry *ref2)