From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Tue, 22 Jul 2025 03:41:50 +0000 (-0400)
Subject: bcachefs: Fix write buffer flushing from open journal entry
X-Git-Tag: v6.16~10^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1831840c2bc502c98c21df2ea0fa419b2ed0a6ec;p=thirdparty%2Flinux.git

bcachefs: Fix write buffer flushing from open journal entry

When flushing the btree write buffer, we pull write buffer keys directly
from the journal instead of letting the journal write path copy them to
the write buffer.

When flushing from the currently open journal buffer, we have to block
new reservations and wait for outstanding reservations to complete.

Recheck the reservation state after blocking new reservations:
previously, we were checking the reservation count from before calling
__journal_block().

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

diff --git a/fs/bcachefs/journal.c b/fs/bcachefs/journal.c
index f22b05e02c1e6..ddfeb0dafc9d8 100644
--- a/fs/bcachefs/journal.c
+++ b/fs/bcachefs/journal.c
@@ -1082,6 +1082,7 @@ static struct journal_buf *__bch2_next_write_buffer_flush_journal_buf(struct jou
 
 			if (open && !*blocked) {
 				__bch2_journal_block(j);
+				s.v = atomic64_read_acquire(&j->reservations.counter);
 				*blocked = true;
 			}