Update bcachefs sources to 1e6618c45d bcachefs: Improve bch2_open_buckets_to_text()

diff --git a/.bcachefs_revision b/.bcachefs_revision
index 1cdced9120cbd4735cc04c096c920be9c4a03d3f..74c86461b69cc62e756148763a43bffcfbe39482 100644 (file)
--- a/.bcachefs_revision
+++ b/.bcachefs_revision
@@ -1 +1 @@
-1ff261b014b74551acb61951d1a1b795e711f143
+1e6618c45d9feb5af8ca1cc103c4def722ba4c54

diff --git a/libbcachefs/alloc_foreground.c b/libbcachefs/alloc_foreground.c
index 112d6e1eac14757b9e73aba0451efffe997c9042..a789666dd078d69db5f021ece00403c89f86aa0d 100644 (file)
--- 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 a38561c7cb0ab4ed9e19326116ad85664c2d5963..f28325443b0d5fe95e15ef0c6abd147ec334e72c 100644 (file)
--- 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 dd7e089a472c5450a4a6ec34777e18dec1adfd51..6456e8b8d6cc2b04faf9bbb0d98732b106f4d56d 100644 (file)
--- 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) {