From 5731cf01567da4f354bbff4a040b53f3f86328ad Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sun, 29 Nov 2020 17:09:13 -0500 Subject: [PATCH] bcachefs: Fix journal reclaim spinning in recovery We can't run journal reclaim until we've finished replaying updates to interior btree nodes - the check for this was in the wrong place though, leading to journal reclaim spinning before it was allowed to proceed. Signed-off-by: Kent Overstreet Signed-off-by: Kent Overstreet --- fs/bcachefs/journal_reclaim.c | 5 +++++ fs/bcachefs/recovery.c | 1 + 2 files changed, 6 insertions(+) diff --git a/fs/bcachefs/journal_reclaim.c b/fs/bcachefs/journal_reclaim.c index 9f0d2e6aa4e30..c20f6de347305 100644 --- a/fs/bcachefs/journal_reclaim.c +++ b/fs/bcachefs/journal_reclaim.c @@ -609,6 +609,10 @@ static int bch2_journal_reclaim_thread(void *arg) struct journal *j = arg; unsigned long next; + set_freezable(); + + kthread_wait_freezable(test_bit(JOURNAL_RECLAIM_STARTED, &j->flags)); + while (!kthread_should_stop()) { j->reclaim_kicked = false; @@ -627,6 +631,7 @@ static int bch2_journal_reclaim_thread(void *arg) if (time_after_eq(jiffies, next)) break; schedule_timeout(next - jiffies); + try_to_freeze(); } __set_current_state(TASK_RUNNING); diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c index 6750063663b5f..0b3521c9cc19e 100644 --- a/fs/bcachefs/recovery.c +++ b/fs/bcachefs/recovery.c @@ -616,6 +616,7 @@ static int bch2_journal_replay(struct bch_fs *c, */ set_bit(BCH_FS_BTREE_INTERIOR_REPLAY_DONE, &c->flags); set_bit(JOURNAL_RECLAIM_STARTED, &j->flags); + journal_reclaim_kick(j); j->replay_journal_seq = seq; -- 2.30.2