Skip to content

Commit 89d21b6

Browse files
author
Kent Overstreet
committed
bcachefs: Add missing bch2_journal_do_writes() call
This fixes a rare deadlock when we're doing an emergency shutdown due to failure to do a journal write. Signed-off-by: Kent Overstreet <[email protected]>
1 parent d6b52f6 commit 89d21b6

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

fs/bcachefs/journal_io.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1677,6 +1677,13 @@ static CLOSURE_CALLBACK(journal_write_done)
16771677
mod_delayed_work(j->wq, &j->write_work, max(0L, delta));
16781678
}
16791679

1680+
/*
1681+
* We don't typically trigger journal writes from her - the next journal
1682+
* write will be triggered immediately after the previous one is
1683+
* allocated, in bch2_journal_write() - but the journal write error path
1684+
* is special:
1685+
*/
1686+
bch2_journal_do_writes(j);
16801687
spin_unlock(&j->lock);
16811688
}
16821689

0 commit comments

Comments
 (0)