diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-11-30 12:38:54 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2018-11-30 12:51:13 -0500 |
| commit | 0c7db4eca3e6519043c10288cb41f8a0ee634a0b (patch) | |
| tree | fd788cd46ea5b14e287b48677a94384a5abcce27 /libbcachefs/debug.c | |
| parent | bca8b084ad754afc54e628d9db7721b90d9480b7 (diff) | |
Update bcachefs sources to 62de7539dc bcachefs: Make bkey types globally unique
Diffstat (limited to 'libbcachefs/debug.c')
| -rw-r--r-- | libbcachefs/debug.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libbcachefs/debug.c b/libbcachefs/debug.c index 77f90f7d..e8a671a1 100644 --- a/libbcachefs/debug.c +++ b/libbcachefs/debug.c @@ -55,7 +55,8 @@ void __bch2_btree_verify(struct bch_fs *c, struct btree *b) v->btree_id = b->btree_id; bch2_btree_keys_init(v, &c->expensive_debug_checks); - if (bch2_btree_pick_ptr(c, b, NULL, &pick) <= 0) + if (bch2_bkey_pick_read_device(c, bkey_i_to_s_c(&b->key), + NULL, &pick) <= 0) return; ca = bch_dev_bkey_exists(c, pick.ptr.dev); @@ -222,8 +223,7 @@ static ssize_t bch2_read_btree(struct file *file, char __user *buf, k = bch2_btree_iter_peek(&iter); while (k.k && !(err = btree_iter_err(k))) { - bch2_bkey_val_to_text(&PBUF(i->buf), i->c, - bkey_type(0, i->id), k); + bch2_bkey_val_to_text(&PBUF(i->buf), i->c, k); i->bytes = strlen(i->buf); BUG_ON(i->bytes >= PAGE_SIZE); i->buf[i->bytes] = '\n'; |