iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcachefs: Fix for getting stuck in journal replay

Browse Source 
In journal replay, we weren't immediately dropping journal pins when we
start doing updates that ewern't from journal replay - leading to
journal reclaim getting stuck.

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
This commit is contained in:
Kent Overstreet 2022-04-12 01:31:33 -04:00 committed by Kent Overstreet
parent e492e7b6f6
commit c609947b5e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/bcachefs/recovery.c
View File

@ -556,7 +556,8 @@ static int journal_keys_sort(struct bch_fs *c)
static void replay_now_at(struct journal *j, u64 seq)
{
BUG_ON(seq < j->replay_journal_seq);
BUG_ON(seq > j->replay_journal_seq_end);
seq = min(seq, j->replay_journal_seq_end);
while (j->replay_journal_seq < seq)
bch2_journal_pin_put(j, j->replay_journal_seq++);
@ -629,8 +630,7 @@ static int bch2_journal_replay(struct bch_fs *c)
cond_resched();
if (!k->allocated)
replay_now_at(j, keys->journal_seq_base + k->journal_seq);
replay_now_at(j, keys->journal_seq_base + k->journal_seq);
ret = bch2_trans_do(c, NULL, NULL,
BTREE_INSERT_LAZY_RW|