alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-23 00:00:02 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Update bcachefs sources to a27d7265e7 bcachefs: Fix a debug mode assertion

Browse Source
This commit is contained in:
Kent Overstreet 2020-04-04 16:48:39 -04:00
parent a62d8713f8
commit 5d6e237b72
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bcachefs_revision
View File

@ -1 +1 @@
7bfc741f64204731ceeabf3061c0470613c67e86 a27d7265e75f6d65c2b972ce4ac27abfc153c230

9
libbcachefs/btree_update_interior.c
View File

@ -45,6 +45,8 @@ static void btree_node_interior_verify(struct btree *b)
while (1) { while (1) {
k = bch2_btree_node_iter_peek_unpack(&iter, b, &unpacked); k = bch2_btree_node_iter_peek_unpack(&iter, b, &unpacked);
if (k.k->type != KEY_TYPE_btree_ptr_v2)
break;
bp = bkey_s_c_to_btree_ptr_v2(k); bp = bkey_s_c_to_btree_ptr_v2(k);
BUG_ON(bkey_cmp(next_node, bp.v->min_key)); BUG_ON(bkey_cmp(next_node, bp.v->min_key));
@ -725,7 +727,7 @@ again:
bch2_journal_res_put(&c->journal, &res); bch2_journal_res_put(&c->journal, &res);
bch2_journal_preres_put(&c->journal, &as->journal_preres); bch2_journal_preres_put(&c->journal, &as->journal_preres);
free_update:
/* Do btree write after dropping journal res: */ /* Do btree write after dropping journal res: */
if (b) { if (b) {
/* /*
@ -736,8 +738,9 @@ again:
six_unlock_intent(&b->lock); six_unlock_intent(&b->lock);
} }
btree_update_nodes_reachable(as, res.seq); if (!ret)
free_update: btree_update_nodes_reachable(as, res.seq);
__bch2_btree_update_free(as); __bch2_btree_update_free(as);
/* /*
* for flush_held_btree_writes() waiting on updates to flush or * for flush_held_btree_writes() waiting on updates to flush or

3
libbcachefs/btree_update_leaf.c
View File

@ -250,7 +250,8 @@ static inline void btree_insert_entry_checks(struct btree_trans *trans,
BUG_ON(bkey_cmp(insert->k.p, iter->pos)); BUG_ON(bkey_cmp(insert->k.p, iter->pos));
BUG_ON(debug_check_bkeys(c) && BUG_ON(debug_check_bkeys(c) &&
bch2_bkey_invalid(c, bkey_i_to_s_c(insert), iter->btree_id)); bch2_bkey_invalid(c, bkey_i_to_s_c(insert),
__btree_node_type(iter->level, iter->btree_id)));
} }
static noinline int static noinline int