diff options
| author |  Kent Overstreet <kent.overstreet@linux.dev>
| 2023-11-17 23:13:49 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev>
| 2023-11-24 02:43:12 -0500 |
| commit | 8a443d3ea1327fea5ac3be77d2e39ebe35bfe9cf (patch) | |
| tree | 74f257252a4f1467c8e6a49e2ec93b48924c2595 /fs/bcachefs/recovery.c | |
| parent | bcachefs: preserve device path as device name (diff) | |
| download | linux-8a443d3ea1327fea5ac3be77d2e39ebe35bfe9cf.tar.gz linux-8a443d3ea1327fea5ac3be77d2e39ebe35bfe9cf.tar.bz2 linux-8a443d3ea1327fea5ac3be77d2e39ebe35bfe9cf.zip | |
bcachefs: Proper refcounting for journal_keys
The btree iterator code overlays keys from the journal until journal
replay is finished; since we're now starting copygc/rebalance etc.
before replay is finished, this is multithreaded access and thus needs
refcounting.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/recovery.c')
| -rw-r--r-- | fs/bcachefs/recovery.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c index 9c30500ce920..770ced1c6285 100644 --- a/fs/bcachefs/recovery.c +++ b/fs/bcachefs/recovery.c @@ -167,6 +167,8 @@ static int bch2_journal_replay(struct bch_fs *c) goto err; } + BUG_ON(!atomic_read(&keys->ref)); + for (i = 0; i < keys->nr; i++) { k = keys_sorted[i]; @@ -188,6 +190,9 @@ static int bch2_journal_replay(struct bch_fs *c) } } + if (!c->opts.keep_journal) + bch2_journal_keys_put_initial(c); + replay_now_at(j, j->replay_journal_seq_end); j->replay_journal_seq = 0; @@ -909,10 +914,8 @@ out: bch2_flush_fsck_errs(c); 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); - } + test_bit(JOURNAL_REPLAY_DONE, &c->journal.flags)) + bch2_journal_keys_put_initial(c); kfree(clean); if (!ret && test_bit(BCH_FS_NEED_DELETE_DEAD_SNAPSHOTS, &c->flags)) { |