From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Sat, 12 Jul 2025 23:31:49 +0000 (-0400)
Subject: bcachefs: Fix triggering of discard by the journal path
X-Git-Tag: v6.16-rc7~36^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4d6e204f892846b435ad5df89306a8ad56191f9;p=thirdparty%2Flinux.git

bcachefs: Fix triggering of discard by the journal path

It becomes possible to do discards after a journal flush, which
naturally the journal code is reponsible for.

A prior refactoring seems to have broken this - which went unnoticed
because the foreground allocator path can also trigger discards.

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

diff --git a/fs/bcachefs/journal_io.c b/fs/bcachefs/journal_io.c
index dd3f3434c1b0..9e028dbcc3d0 100644
--- a/fs/bcachefs/journal_io.c
+++ b/fs/bcachefs/journal_io.c
@@ -1767,6 +1767,7 @@ static CLOSURE_CALLBACK(journal_write_done)
 
 			closure_wake_up(&c->freelist_wait);
 			bch2_reset_alloc_cursors(c);
+			do_discards = true;
 		}
 
 		j->seq_ondisk = seq;