Merge branch 'koverstreet:master' into FixTypo

koverstreet · Sep 6, 2024 · 0374ecd · 0374ecd
2 parents 10d1a2a + b675b2e
commit 0374ecd
Showing 1 changed file with 2 additions and 0 deletions.
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) {