Update bcachefs sources to adfbb84c7c fixup! bcachefs: Fix bch2_verify_insert_pos()

This commit is contained in:
Kent Overstreet 2019-12-16 17:36:24 -05:00
parent b74c93d43c
commit f7566516de
3 changed files with 5 additions and 4 deletions

View File

@ -1 +1 @@
fbb669e9dec85dc63cdcae71746187d5562dc287
adfbb84c7c986f2f46f363d95bca33b4c470dad0

View File

@ -253,8 +253,8 @@ void bch2_verify_insert_pos(struct btree *b, struct bkey_packed *where,
bch2_bkey_to_text(&PBUF(buf2), &k2);
panic("prev > insert:\n"
"prev key %5u %s\n"
"insert key %5u %s\n",
"prev key %s\n"
"insert key %s\n",
buf1, buf2);
}
#endif

View File

@ -1148,7 +1148,8 @@ static int btree_iter_traverse_one(struct btree_iter *iter)
iter->uptodate = BTREE_ITER_NEED_PEEK;
bch2_btree_trans_verify_locks(iter->trans);
__bch2_btree_iter_verify(iter, iter->l[iter->level].b);
if (btree_iter_node(iter, iter->level))
__bch2_btree_iter_verify(iter, iter->l[iter->level].b);
return 0;
}