github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-31 18:43:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

btrfs: use rb_find_add() in insert_root_entry()

Browse Source 
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>
This commit is contained in:
Yangtao Li 2025-05-16 11:03:26 +08:00 committed by David Sterba
parent afaa9f8235
commit c6e3ae8ac3
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fs/btrfs/ref-verify.c
View File

@ -125,28 +125,20 @@ static int root_entry_root_objectid_key_cmp(const void *key, const struct rb_nod
return 0;
}
static int root_entry_root_objectid_cmp(struct rb_node *new, const struct rb_node *existing)
{
const struct root_entry *new_entry = rb_entry(new, struct root_entry, node);
return root_entry_root_objectid_key_cmp(&new_entry->root_objectid, existing);
}
static struct root_entry *insert_root_entry(struct rb_root *root,
struct root_entry *re)
{
struct rb_node **p = &root->rb_node;
struct rb_node *parent_node = NULL;
struct root_entry *entry;
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;
}
rb_link_node(&re->node, parent_node, p);
rb_insert_color(&re->node, root);
return NULL;
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)