diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-04-10 00:48:36 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:09:31 -0400 |
| commit | cf0dd697ebc9090d0aeafa933e0e688e291a24fc (patch) | |
| tree | e14f84c265f02021312d3262b7d6ae0c5c4fb40b | |
| parent | a9c0a4cbf1ceb9842fee5d7084817509a5e962aa (diff) | |
| download | linux-stable-cf0dd697ebc9090d0aeafa933e0e688e291a24fc.tar.gz linux-stable-cf0dd697ebc9090d0aeafa933e0e688e291a24fc.zip | |
bcachefs: Don't trigger extra assertions in journal replay
We now pass a rw argument to .key_invalid methods so they can trigger
assertions for updates but not on existing keys. We shouldn't trigger
these extra assertions in journal replay - this patch changes the
transaction commit path accordingly.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
| -rw-r--r-- | fs/bcachefs/btree_io.c | 4 | ||||
| -rw-r--r-- | fs/bcachefs/btree_update_leaf.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/fs/bcachefs/btree_io.c b/fs/bcachefs/btree_io.c index ba1d775039a3..f847928ab743 100644 --- a/fs/bcachefs/btree_io.c +++ b/fs/bcachefs/btree_io.c @@ -767,9 +767,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/fs/bcachefs/btree_update_leaf.c b/fs/bcachefs/btree_update_leaf.c index 449fbae585cb..bc7faf29b3bc 100644 --- a/fs/bcachefs/btree_update_leaf.c +++ b/fs/bcachefs/btree_update_leaf.c @@ -864,10 +864,11 @@ static inline int do_bch2_trans_commit(struct btree_trans *trans, struct btree_insert_entry *i; struct printbuf buf = PRINTBUF; int ret, u64s_delta = 0; + int rw = (trans->flags & BTREE_INSERT_JOURNAL_REPLAY) ? READ : WRITE; trans_for_each_update(trans, i) { if (bch2_bkey_invalid(c, bkey_i_to_s_c(i->k), - i->bkey_type, WRITE, &buf)) { + i->bkey_type, rw, &buf)) { printbuf_reset(&buf); pr_buf(&buf, "invalid bkey on insert from %s -> %ps", trans->fn, (void *) i->ip_allocated); @@ -878,7 +879,7 @@ static inline int do_bch2_trans_commit(struct btree_trans *trans, pr_newline(&buf); bch2_bkey_invalid(c, bkey_i_to_s_c(i->k), - i->bkey_type, WRITE, &buf); + i->bkey_type, rw, &buf); bch2_trans_inconsistent(trans, "%s", buf.buf); printbuf_exit(&buf); |