bcachefs: Add missing bch2_journal_do_writes() call

Kent Overstreet · Kent Overstreet · commit 89d21b69b4f8 · 2024-06-23T12:55:32.000-04:00
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 &lt;kent.overstreet@linux.dev&gt;
diff --git a/fs/bcachefs/journal_io.c b/fs/bcachefs/journal_io.c
@@ -1677,6 +1677,13 @@ static CLOSURE_CALLBACK(journal_write_done)
 		mod_delayed_work(j->wq, &j->write_work, max(0L, delta));
 	}
 
+	/*
+	 * We don't typically trigger journal writes from her - the next journal
+	 * write will be triggered immediately after the previous one is
+	 * allocated, in bch2_journal_write() - but the journal write error path
+	 * is special:
+	 */
+	bch2_journal_do_writes(j);
 	spin_unlock(&j->lock);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1677,6 +1677,13 @@ static CLOSURE_CALLBACK(journal_write_done)`
`1677`	`1677`	`mod_delayed_work(j->wq, &j->write_work, max(0L, delta));`
`1678`	`1678`	`}`
`1679`	`1679`
	`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);`
`1680`	`1687`	`spin_unlock(&j->lock);`
`1681`	`1688`	`}`
`1682`	`1689`