diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2022-10-23 17:37:23 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:09:45 -0400 |
| commit | c167f9e54100179a009051ad6eac1dfb0bcd21f6 (patch) | |
| tree | b2689f7103c5b36ccc82947b398e4ed71638c182 /fs | |
| parent | 1f69368c5cfce6770d101aaeff46ef22d22de07c (diff) | |
| download | lwn-c167f9e54100179a009051ad6eac1dfb0bcd21f6.tar.gz lwn-c167f9e54100179a009051ad6eac1dfb0bcd21f6.zip | |
bcachefs: Journal keys overlay fixes
- In the btree iterator code that overlays keys from the journal, we
were incorrectly specifying level=0 instead of the btree_path's
current level in a few places
- When we didn't do journal replay, we shouldn't free the journal keys:
this fixes cmd_list and cmd_dump, which run in norecovery mode
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/bcachefs/btree_iter.c | 2 | ||||
| -rw-r--r-- | fs/bcachefs/recovery.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c index 611f7b0ca014..5af295317cee 100644 --- a/fs/bcachefs/btree_iter.c +++ b/fs/bcachefs/btree_iter.c @@ -1834,7 +1834,7 @@ struct bkey_s_c btree_trans_peek_journal(struct btree_trans *trans, { struct bkey_i *next_journal = bch2_btree_journal_peek(trans, iter, - k.k ? k.k->p : iter->path->l[0].b->key.k.p); + k.k ? k.k->p : path_l(iter->path)->b->key.k.p); if (next_journal) { iter->k = next_journal->k; diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c index 580ff915d0e6..b2379adcf8ae 100644 --- a/fs/bcachefs/recovery.c +++ b/fs/bcachefs/recovery.c @@ -1398,7 +1398,8 @@ out: set_bit(BCH_FS_FSCK_DONE, &c->flags); bch2_flush_fsck_errs(c); - if (!c->opts.keep_journal) { + if (!c->opts.keep_journal && + test_bit(JOURNAL_REPLAY_DONE, &c->journal.flags)) { bch2_journal_keys_free(&c->journal_keys); bch2_journal_entries_free(c); } |