diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2024-09-22 01:13:01 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-09-29 22:18:18 -0400 |
| commit | 9f20109509c553feeb57600a8a3b5e3177b43f6d (patch) | |
| tree | 1153e5b34dad50e9816c4b705a8fed876b7a065f /libbcachefs/btree_io.c | |
| parent | 7a98f526b52e0ad9a13c77edd1fda528e23640da (diff) | |
Update bcachefs sources to 438696e03da7 bcachefs: rename version -> bversion for big endian builds
Diffstat (limited to 'libbcachefs/btree_io.c')
| -rw-r--r-- | libbcachefs/btree_io.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libbcachefs/btree_io.c b/libbcachefs/btree_io.c index cb48a947..1c1448b5 100644 --- a/libbcachefs/btree_io.c +++ b/libbcachefs/btree_io.c @@ -1195,6 +1195,10 @@ int bch2_btree_node_read_done(struct bch_fs *c, struct bch_dev *ca, set_btree_bset(b, b->set, &b->data->keys); b->nr = bch2_key_sort_fix_overlapping(c, &sorted->keys, iter); + memset((uint8_t *)(sorted + 1) + b->nr.live_u64s * sizeof(u64), 0, + btree_buf_bytes(b) - + sizeof(struct btree_node) - + b->nr.live_u64s * sizeof(u64)); u64s = le16_to_cpu(sorted->keys.u64s); *sorted = *b->data; @@ -1219,7 +1223,7 @@ int bch2_btree_node_read_done(struct bch_fs *c, struct bch_dev *ca, ret = bch2_bkey_val_validate(c, u.s_c, READ); if (ret == -BCH_ERR_fsck_delete_bkey || (bch2_inject_invalid_keys && - !bversion_cmp(u.k->version, MAX_VERSION))) { + !bversion_cmp(u.k->bversion, MAX_VERSION))) { btree_keys_account_key_drop(&b->nr, 0, k); i->u64s = cpu_to_le16(le16_to_cpu(i->u64s) - k->u64s); |