korg/btrfs-progs
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git synced 2024-12-14 06:33:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: image: pass rb_root to find_collisions

Browse Source 
We don't need the full metadump structure, pass only the name tree.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2017-10-20 01:04:55 +02:00
parent 6e43cc2e97
commit 43f052a52f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
image/main.c
View File

@ -446,7 +446,7 @@ static int find_collision_reverse_crc32c(struct name *val, u32 name_len)
return found;
}
static char *find_collision(struct metadump_struct *md, char *name,
static char *find_collision(struct rb_root *name_tree, char *name,
u32 name_len)
{
struct name *val;
@ -457,7 +457,7 @@ static char *find_collision(struct metadump_struct *md, char *name,
tmp.val = name;
tmp.len = name_len;
entry = tree_search(&md->name_tree, &tmp.n, name_cmp, 0);
entry = tree_search(name_tree, &tmp.n, name_cmp, 0);
if (entry) {
val = rb_entry(entry, struct name, n);
free(name);
@ -498,7 +498,7 @@ static char *find_collision(struct metadump_struct *md, char *name,
}
}
tree_insert(&md->name_tree, &val->n, name_cmp);
tree_insert(name_tree, &val->n, name_cmp);
return val->sub;
}
@ -531,7 +531,7 @@ static void sanitize_dir_item(struct metadump_struct *md, struct extent_buffer *
return;
}
read_extent_buffer(eb, buf, name_ptr, name_len);
garbage = find_collision(md, buf, name_len);
garbage = find_collision(&md->name_tree, buf, name_len);
} else {
garbage = generate_garbage(name_len);
}
@ -585,7 +585,7 @@ static void sanitize_inode_ref(struct metadump_struct *md,
return;
}
read_extent_buffer(eb, buf, name_ptr, len);
garbage = find_collision(md, buf, len);
garbage = find_collision(&md->name_tree, buf, len);
} else {
garbage = generate_garbage(len);
}