diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2025-03-26 11:44:30 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2025-04-06 19:33:53 -0400 |
| commit | 55fd97fbc4744a43fb2d134908e481266cf33bda (patch) | |
| tree | 9f8a1f66d9ec0a7fb4c5b2e5e0143998bef1713e /fs/bcachefs/btree_journal_iter.c | |
| parent | bcachefs: Remove unnecessary softdep on xxhash (diff) | |
| download | linux-55fd97fbc4744a43fb2d134908e481266cf33bda.tar.gz linux-55fd97fbc4744a43fb2d134908e481266cf33bda.zip | |
bcachefs: Use sort_nonatomic() instead of sort()
Fixes "task out to lunch" warnings during recovery on large machines
with lots of dirty data in the journal.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/btree_journal_iter.c')
| -rw-r--r-- | fs/bcachefs/btree_journal_iter.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/bcachefs/btree_journal_iter.c b/fs/bcachefs/btree_journal_iter.c index d1ad1a7613c9..7d6c971db23c 100644 --- a/fs/bcachefs/btree_journal_iter.c +++ b/fs/bcachefs/btree_journal_iter.c @@ -644,8 +644,6 @@ void bch2_btree_and_journal_iter_init_node_iter(struct btree_trans *trans, */ static int journal_sort_key_cmp(const void *_l, const void *_r) { - cond_resched(); - const struct journal_key *l = _l; const struct journal_key *r = _r; @@ -689,7 +687,8 @@ void bch2_journal_keys_put(struct bch_fs *c) static void __journal_keys_sort(struct journal_keys *keys) { - sort(keys->data, keys->nr, sizeof(keys->data[0]), journal_sort_key_cmp, NULL); + sort_nonatomic(keys->data, keys->nr, sizeof(keys->data[0]), + journal_sort_key_cmp, NULL); cond_resched(); |