iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcachefs: Fix building of aux search trees

Browse Source 
We weren't packing the min/max keys, which was a major oversight and
completely disabled generating bkey_floats for adjacent nodes.

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2021-03-26 20:10:59 -04:00 committed by Kent Overstreet
parent 2da5d000b9
commit c7e04e22e0
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
fs/bcachefs/bset.c
View File

@ -674,16 +674,20 @@ static void make_bfloat(struct btree *b, struct bset_tree *t,
if (is_power_of_2(j) &&
!min_key->u64s) {
k = (void *) min_key;
bkey_init(&k->k);
k->k.p = b->data->min_key;
if (!bkey_pack_pos(min_key, b->data->min_key, b)) {
k = (void *) min_key;
bkey_init(&k->k);
k->k.p = b->data->min_key;
}
}
if (is_power_of_2(j + 1) &&
!max_key->u64s) {
k = (void *) max_key;
bkey_init(&k->k);
k->k.p = t->max_key;
if (!bkey_pack_pos(max_key, b->data->max_key, b)) {
k = (void *) max_key;
bkey_init(&k->k);
k->k.p = t->max_key;
}
}
__make_bfloat(b, t, j, min_key, max_key);
@ -768,10 +772,15 @@ retry:
t->max_key = bkey_unpack_pos(b, prev);
bkey_init(&min_key.k);
min_key.k.p = b->data->min_key;
bkey_init(&max_key.k);
max_key.k.p = t->max_key;
if (!bkey_pack_pos(bkey_to_packed(&min_key), b->data->min_key, b)) {
bkey_init(&min_key.k);
min_key.k.p = b->data->min_key;
}
if (!bkey_pack_pos(bkey_to_packed(&max_key), b->data->max_key, b)) {
bkey_init(&max_key.k);
max_key.k.p = t->max_key;
}
/* Then we build the tree */
eytzinger1_for_each(j, t->size)