Update bcachefs sources to e99d29e402 bcachefs: zstd support, compression refactoring

[bcachefs-tools-debian] / libbcachefs / btree_io.c

diff --git a/libbcachefs/btree_io.c b/libbcachefs/btree_io.c
index 9b4eff1c83d1eb4320a8b6a9074a7611ddafd5c3..d805fb41886be1edbdaebdb87167d05d6eeb4166 100644 (file)
--- a/libbcachefs/btree_io.c
+++ b/libbcachefs/btree_io.c
@@ -1135,6 +1135,7 @@ int bch2_btree_node_read_done(struct bch_fs *c, struct btree *b, bool have_retry
                unsigned sectors, whiteout_u64s = 0;
                struct nonce nonce;
                struct bch_csum csum;
+               bool first = !b->written;
 
                if (!b->written) {
                        i = &b->data->keys;
@@ -1194,10 +1195,10 @@ int bch2_btree_node_read_done(struct bch_fs *c, struct btree *b, bool have_retry
                }
 
                if (ret) {
-                       btree_err_on(!b->written,
+                       btree_err_on(first,
                                     BTREE_ERR_FIXABLE, c, b, i,
                                     "first btree node bset has blacklisted journal seq");
-                       if (b->written)
+                       if (!first)
                                continue;
                }