bcachefs: fix hung task timeout in journal read

Kent Overstreet · Kent Overstreet · commit aed4ccbf4595 · 2025-05-05T14:21:28.000-04:00
Signed-off-by: Kent Overstreet &lt;kent.overstreet@linux.dev&gt;
diff --git a/fs/bcachefs/journal_io.c b/fs/bcachefs/journal_io.c
@@ -19,6 +19,7 @@
 
 #include <linux/ioprio.h>
 #include <linux/string_choices.h>
+#include <linux/sched/sysctl.h>
 
 void bch2_journal_pos_from_member_info_set(struct bch_fs *c)
 {
@@ -1262,7 +1263,8 @@ int bch2_journal_read(struct bch_fs *c,
 			degraded = true;
 	}
 
-	closure_sync(&jlist.cl);
+	while (closure_sync_timeout(&jlist.cl, sysctl_hung_task_timeout_secs * HZ / 2))
+		;
 
 	if (jlist.ret)
 		return jlist.ret;

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`
`20`	`20`	`#include <linux/ioprio.h>`
`21`	`21`	`#include <linux/string_choices.h>`
	`22`	`+#include <linux/sched/sysctl.h>`
`22`	`23`
`23`	`24`	`void bch2_journal_pos_from_member_info_set(struct bch_fs *c)`
`24`	`25`	`{`
`@@ -1262,7 +1263,8 @@ int bch2_journal_read(struct bch_fs *c,`
`1262`	`1263`	`degraded = true;`
`1263`	`1264`	`}`
`1264`	`1265`
`1265`		`- closure_sync(&jlist.cl);`
	`1266`	`+ while (closure_sync_timeout(&jlist.cl, sysctl_hung_task_timeout_secs * HZ / 2))`
	`1267`	`+ ;`
`1266`	`1268`
`1267`	`1269`	`if (jlist.ret)`
`1268`	`1270`	`return jlist.ret;`