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 1e6618c45d bcachefs: Improve bch2_open_buckets_to_text()

Browse Source
This commit is contained in:
Kent Overstreet 2022-04-10 18:07:55 -04:00
parent 14aaa25ff2
commit d256ebaa81
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bcachefs_revision
View File

@ -1 +1 @@
1ff261b014b74551acb61951d1a1b795e711f143 1e6618c45d9feb5af8ca1cc103c4def722ba4c54

6
libbcachefs/alloc_foreground.c
View File

@ -1265,12 +1265,12 @@ void bch2_open_buckets_to_text(struct printbuf *out, struct bch_fs *c)
ob++) { ob++) {
spin_lock(&ob->lock); spin_lock(&ob->lock);
if (ob->valid && !ob->on_partial_list) { 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, ob - c->open_buckets,
atomic_read(&ob->pin), 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); spin_unlock(&ob->lock);
} }
} }

4
libbcachefs/btree_io.c
View File

@ -772,9 +772,9 @@ static int bset_key_invalid(struct bch_fs *c, struct btree *b,
bool updated_range, int rw, bool updated_range, int rw,
struct printbuf *err) 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) ?: (!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, static int validate_bset_keys(struct bch_fs *c, struct btree *b,

1
libbcachefs/journal_io.c
View File

@ -1051,6 +1051,7 @@ int bch2_journal_read(struct bch_fs *c, u64 *blacklist_seq, u64 *start_seq)
closure_init_stack(&jlist.cl); closure_init_stack(&jlist.cl);
mutex_init(&jlist.lock); mutex_init(&jlist.lock);
jlist.last_seq = 0;
jlist.ret = 0; jlist.ret = 0;
for_each_member_device(ca, c, iter) { for_each_member_device(ca, c, iter) {