Commit 77ad1df8 authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: Fix "journal stuck" during recovery 



If we crash when the journal pin fifo is completely full - i.e. we're
at the maximum number of dirty journal entries - that may put us in a
sticky situation in recovery, as journal replay will need to be able to
open new journal entries in order to get going.

bch2_fs_journal_start() already had provisions for resizing the journal
pin fifo if needed, but it needs a fudge factor to ensure there's room
for journal replay.

Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent 2581f89a

fs/bcachefs/journal.c

+8 −0
Original line number Diff line number Diff line
@@ -1404,6 +1404,14 @@ int bch2_fs_journal_start(struct journal *j, u64 cur_seq) 


	nr = cur_seq - last_seq;



	/*

	 * Extra fudge factor, in case we crashed when the journal pin fifo was

	 * nearly or completely full. We'll need to be able to open additional

	 * journal entries (at least a few) in order for journal replay to get

	 * going:

	 */

	nr += nr / 4;



	if (nr + 1 > j->pin.size) {

		free_fifo(&j->pin);

		init_fifo(&j->pin, roundup_pow_of_two(nr + 1), GFP_KERNEL);