bcachefs: Fix journal getting stuck on a flush commit

silly race

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/journal_io.c b/fs/bcachefs/journal_io.c
index db24ce2..f17c478 100644 (file)
--- a/fs/bcachefs/journal_io.c
+++ b/fs/bcachefs/journal_io.c
@@ -1762,11 +1762,13 @@ static CLOSURE_CALLBACK(journal_write_preflush)
 
        if (j->seq_ondisk + 1 != le64_to_cpu(w->data->seq)) {
                spin_lock(&j->lock);
-               closure_wait(&j->async_wait, cl);
+               if (j->seq_ondisk + 1 != le64_to_cpu(w->data->seq)) {
+                       closure_wait(&j->async_wait, cl);
+                       spin_unlock(&j->lock);
+                       continue_at(cl, journal_write_preflush, j->wq);
+                       return;
+               }
                spin_unlock(&j->lock);
-
-               continue_at(cl, journal_write_preflush, j->wq);
-               return;
        }
 
        if (w->separate_flush) {