]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
bcachefs: Silence "unable to allocate journal write" if we're already RO
authorKent Overstreet <kent.overstreet@linux.dev>
Wed, 4 Dec 2024 22:48:06 +0000 (17:48 -0500)
committerKent Overstreet <kent.overstreet@linux.dev>
Sat, 21 Dec 2024 06:36:21 +0000 (01:36 -0500)
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
fs/bcachefs/journal_io.c

index bb69d80886b525397389897dd615c7f9ec4f9749..e7a43400a587defbcdb7356b09da863cda635e9b 100644 (file)
@@ -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