bcachefs: Convert journal BUG_ON() to a warning
authorKent Overstreet <kent.overstreet@gmail.com>
Sat, 13 Nov 2021 22:53:55 +0000 (17:53 -0500)
committerKent Overstreet <kent.overstreet@linux.dev>
Sun, 22 Oct 2023 21:09:17 +0000 (17:09 -0400)
It's definitely indicative of a bug if we request to flush a journal
sequence number that hasn't happened yet, but it's more useful if we
warn and print out the relevant sequence numbers instead of just dying.

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
fs/bcachefs/journal.c

index 1abd1ac560e6d8e5fbcbacf9be1eb5d669c4e40c..1ee012d94b4aeea9382649eccf5413be18f9175d 100644 (file)
@@ -550,7 +550,10 @@ int bch2_journal_flush_seq_async(struct journal *j, u64 seq,
 
        spin_lock(&j->lock);
 
-       BUG_ON(seq > journal_cur_seq(j));
+       if (WARN_ONCE(seq > journal_cur_seq(j),
+                     "requested to flush journal seq %llu, but currently at %llu",
+                     seq, journal_cur_seq(j)))
+               goto out;
 
        /* Recheck under lock: */
        if (j->err_seq && seq >= j->err_seq) {