diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-12-16 17:36:24 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2019-12-16 17:36:24 -0500 |
| commit | f7566516dec40d392d33d92ca1f0ea9de90db6fc (patch) | |
| tree | dfc92b8bb85b04f1bc97cd49c8afacee0fd3c9ee | |
| parent | b74c93d43cb5e02c169569b4d4ca312548b964ba (diff) | |
Update bcachefs sources to adfbb84c7c fixup! bcachefs: Fix bch2_verify_insert_pos()
| -rw-r--r-- | .bcachefs_revision | 2 | ||||
| -rw-r--r-- | libbcachefs/bset.c | 4 | ||||
| -rw-r--r-- | libbcachefs/btree_iter.c | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/.bcachefs_revision b/.bcachefs_revision index ed8e490b..7ea6a71d 100644 --- a/.bcachefs_revision +++ b/.bcachefs_revision @@ -1 +1 @@ -fbb669e9dec85dc63cdcae71746187d5562dc287 +adfbb84c7c986f2f46f363d95bca33b4c470dad0 diff --git a/libbcachefs/bset.c b/libbcachefs/bset.c index b303aa82..d6792d27 100644 --- a/libbcachefs/bset.c +++ b/libbcachefs/bset.c @@ -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 diff --git a/libbcachefs/btree_iter.c b/libbcachefs/btree_iter.c index a4180124..918e6fe4 100644 --- a/libbcachefs/btree_iter.c +++ b/libbcachefs/btree_iter.c @@ -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; } |