diff options
| -rw-r--r-- | .bcachefs_revision | 2 | ||||
| -rw-r--r-- | libbcachefs/alloc_foreground.c | 6 | ||||
| -rw-r--r-- | libbcachefs/btree_io.c | 4 | ||||
| -rw-r--r-- | libbcachefs/journal_io.c | 1 |
4 files changed, 7 insertions, 6 deletions
diff --git a/.bcachefs_revision b/.bcachefs_revision index 1cdced91..74c86461 100644 --- a/.bcachefs_revision +++ b/.bcachefs_revision @@ -1 +1 @@ -1ff261b014b74551acb61951d1a1b795e711f143 +1e6618c45d9feb5af8ca1cc103c4def722ba4c54 diff --git a/libbcachefs/alloc_foreground.c b/libbcachefs/alloc_foreground.c index 112d6e1e..a789666d 100644 --- a/libbcachefs/alloc_foreground.c +++ b/libbcachefs/alloc_foreground.c @@ -1265,12 +1265,12 @@ void bch2_open_buckets_to_text(struct printbuf *out, struct bch_fs *c) ob++) { spin_lock(&ob->lock); if (ob->valid && !ob->on_partial_list) { - pr_buf(out, "%zu ref %u type %s\n", + pr_buf(out, "%zu ref %u type %s %u:%llu:%u\n", ob - c->open_buckets, atomic_read(&ob->pin), - bch2_data_types[ob->data_type]); + bch2_data_types[ob->data_type], + ob->dev, ob->bucket, ob->gen); } spin_unlock(&ob->lock); } - } diff --git a/libbcachefs/btree_io.c b/libbcachefs/btree_io.c index a38561c7..f2832544 100644 --- a/libbcachefs/btree_io.c +++ b/libbcachefs/btree_io.c @@ -772,9 +772,9 @@ static int bset_key_invalid(struct bch_fs *c, struct btree *b, bool updated_range, int rw, struct printbuf *err) { - return __bch2_bkey_invalid(c, k, btree_node_type(b), rw, err) ?: + return __bch2_bkey_invalid(c, k, btree_node_type(b), READ, err) ?: (!updated_range ? bch2_bkey_in_btree_node(b, k, err) : 0) ?: - (rw == WRITE ? bch2_bkey_val_invalid(c, k, rw, err) : 0); + (rw == WRITE ? bch2_bkey_val_invalid(c, k, READ, err) : 0); } static int validate_bset_keys(struct bch_fs *c, struct btree *b, diff --git a/libbcachefs/journal_io.c b/libbcachefs/journal_io.c index dd7e089a..6456e8b8 100644 --- a/libbcachefs/journal_io.c +++ b/libbcachefs/journal_io.c @@ -1051,6 +1051,7 @@ int bch2_journal_read(struct bch_fs *c, u64 *blacklist_seq, u64 *start_seq) closure_init_stack(&jlist.cl); mutex_init(&jlist.lock); + jlist.last_seq = 0; jlist.ret = 0; for_each_member_device(ca, c, iter) { |