bcachefs: Add a cond_resched() to __journal_keys_sort()

Kent Overstreet · Kent Overstreet · commit ec36573dcd7b · 2024-09-09T09:41:46.000-04:00
Without this, we'd potentially sort multiple times without a
cond_resched(), leading to hung task warnings on larger systems.

Signed-off-by: Kent Overstreet &lt;kent.overstreet@linux.dev&gt;
diff --git a/fs/bcachefs/btree_journal_iter.c b/fs/bcachefs/btree_journal_iter.c
@@ -530,6 +530,8 @@ static void __journal_keys_sort(struct journal_keys *keys)
 {
 	sort(keys->data, keys->nr, sizeof(keys->data[0]), journal_sort_key_cmp, NULL);
 
+	cond_resched();
+
 	struct journal_key *dst = keys->data;
 
 	darray_for_each(*keys, src) {

Original file line number	Diff line number	Diff line change
`@@ -530,6 +530,8 @@ static void __journal_keys_sort(struct journal_keys *keys)`
`530`	`530`	`{`
`531`	`531`	`sort(keys->data, keys->nr, sizeof(keys->data[0]), journal_sort_key_cmp, NULL);`
`532`	`532`
	`533`	`+ cond_resched();`
	`534`	`+`
`533`	`535`	`struct journal_key *dst = keys->data;`
`534`	`536`
`535`	`537`	`darray_for_each(*keys, src) {`