]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
bcachefs: Don't flush journal after replay
authorKent Overstreet <kent.overstreet@linux.dev>
Fri, 10 Nov 2023 04:43:35 +0000 (23:43 -0500)
committerKent Overstreet <kent.overstreet@linux.dev>
Mon, 1 Jan 2024 16:47:37 +0000 (11:47 -0500)
The flush_all_pins() after journal replay was unecessary, and trying to
completely flush the journal while RW is not a great idea - it's not
guaranteed to terminate if other threads keep adding things to the
jorunal.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
fs/bcachefs/recovery.c

index 5cbef7ad8cc89b179034744a035c4a38ef6d1a16..a588092241ca7d53d2ec9002371c02572efcef7c 100644 (file)
@@ -230,10 +230,8 @@ static int bch2_journal_replay(struct bch_fs *c)
        j->replay_journal_seq = 0;
 
        bch2_journal_set_replay_done(j);
-       bch2_journal_flush_all_pins(j);
-       ret = bch2_journal_error(j);
 
-       if (keys->nr && !ret)
+       if (keys->nr)
                bch2_journal_log_msg(c, "journal replay finished");
 err:
        if (trans)