diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-01-28 16:16:51 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2021-01-28 16:16:51 -0500 |
| commit | 7740db24f7b169dc09938ad67d2c15771fa070da (patch) | |
| tree | d5611543c97bcdf30a82341af2c4cab8499cef90 /libbcachefs/extents.c | |
| parent | 19f921604d3bacf7a8b243d0548b408bd93e8827 (diff) | |
Update bcachefs sources to bee34d805c bcachefs: Repair bad data pointers
Diffstat (limited to 'libbcachefs/extents.c')
| -rw-r--r-- | libbcachefs/extents.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libbcachefs/extents.c b/libbcachefs/extents.c index c0ae3123..67ba2c21 100644 --- a/libbcachefs/extents.c +++ b/libbcachefs/extents.c @@ -215,9 +215,8 @@ void bch2_btree_ptr_v2_to_text(struct printbuf *out, struct bch_fs *c, { struct bkey_s_c_btree_ptr_v2 bp = bkey_s_c_to_btree_ptr_v2(k); - pr_buf(out, "seq %llx sectors %u written %u min_key ", + pr_buf(out, "seq %llx written %u min_key ", le64_to_cpu(bp.v->seq), - le16_to_cpu(bp.v->sectors), le16_to_cpu(bp.v->sectors_written)); bch2_bpos_to_text(out, bp.v->min_key); @@ -1082,10 +1081,9 @@ const char *bch2_bkey_ptrs_invalid(const struct bch_fs *c, struct bkey_s_c k) unsigned nonce = UINT_MAX; unsigned i; - if (k.k->type == KEY_TYPE_btree_ptr) + if (k.k->type == KEY_TYPE_btree_ptr || + k.k->type == KEY_TYPE_btree_ptr_v2) size_ondisk = c->opts.btree_node_size; - if (k.k->type == KEY_TYPE_btree_ptr_v2) - size_ondisk = le16_to_cpu(bkey_s_c_to_btree_ptr_v2(k).v->sectors); bkey_extent_entry_for_each(ptrs, entry) { if (__extent_entry_type(entry) >= BCH_EXTENT_ENTRY_MAX) |