From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Wed, 4 Dec 2024 22:48:06 +0000 (-0500)
Subject: bcachefs: Silence "unable to allocate journal write" if we're already RO
X-Git-Tag: io_uring-6.14-20240131~27^2~103
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=3f1cf04ff9877bf043795d05bb6704d0a85bcd80;p=linux-block.git

bcachefs: Silence "unable to allocate journal write" if we're already RO

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

diff --git a/fs/bcachefs/journal_io.c b/fs/bcachefs/journal_io.c
index bb69d80886b5..e7a43400a587 100644
--- a/fs/bcachefs/journal_io.c
+++ b/fs/bcachefs/journal_io.c
@@ -2032,7 +2032,7 @@ CLOSURE_CALLBACK(bch2_journal_write)
 		bch2_journal_do_discards(j);
 	}
 
-	if (ret) {
+	if (ret && !bch2_journal_error(j)) {
 		struct printbuf buf = PRINTBUF;
 		buf.atomic++;
 
@@ -2044,8 +2044,9 @@ CLOSURE_CALLBACK(bch2_journal_write)
 		spin_unlock(&j->lock);
 		bch2_print_string_as_lines(KERN_ERR, buf.buf);
 		printbuf_exit(&buf);
-		goto err;
 	}
+	if (ret)
+		goto err;
 
 	/*
 	 * write is allocated, no longer need to account for it in