alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-22 00:00:03 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Update bcachefs sources to 7a06c01fa3 bcachefs: Fix for getting stuck in journal replay

Browse Source
This commit is contained in:
Kent Overstreet 2022-04-12 12:52:50 -04:00
parent f89eb5a288
commit 51d44e575c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bcachefs_revision
View File

@ -1 +1 @@
de2fbf8b875fd8e61cc9a583d073f5527e3cb8e7
7a06c01fa30b52389bb050244ecfae48026efaa1

6
libbcachefs/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|