diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-04-12 12:52:50 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2022-04-12 12:52:50 -0400 |
| commit | 51d44e575c8e07d35fd3ce847364e09501d8fda1 (patch) | |
| tree | 924504f9e34aa5a1113a3e4493e2aa43f7908fd9 /libbcachefs/recovery.c | |
| parent | f89eb5a2884d3afde05ee2cad83a813f4ea5cfb9 (diff) | |
Update bcachefs sources to 7a06c01fa3 bcachefs: Fix for getting stuck in journal replay
Diffstat (limited to 'libbcachefs/recovery.c')
| -rw-r--r-- | libbcachefs/recovery.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libbcachefs/recovery.c b/libbcachefs/recovery.c index 80acbc7d..a9b4ad17 100644 --- a/libbcachefs/recovery.c +++ b/libbcachefs/recovery.c @@ -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| |