summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@linux.dev>2023-12-28 02:31:21 +0100
committerKent Overstreet <kent.overstreet@linux.dev>2024-01-06 05:24:19 +0100
commitf412392f6ea3168c0b9730532bc6298c07c4e378 (patch)
treefda7de9ff1606adf4f122052e1a8479fd4874013
parentbcachefs: wb_key_cmp -> wb_key_ref_cmp (diff)
downloadlinux-f412392f6ea3168c0b9730532bc6298c07c4e378.tar.xz
linux-f412392f6ea3168c0b9730532bc6298c07c4e378.zip
bcachefs: __journal_keys_sort() refactoring
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
-rw-r--r--fs/bcachefs/btree_journal_iter.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/bcachefs/btree_journal_iter.c b/fs/bcachefs/btree_journal_iter.c
index 4c084ce493a4..719a94a84950 100644
--- a/fs/bcachefs/btree_journal_iter.c
+++ b/fs/bcachefs/btree_journal_iter.c
@@ -467,9 +467,7 @@ static void __journal_keys_sort(struct journal_keys *keys)
src = dst = keys->d;
while (src < keys->d + keys->nr) {
while (src + 1 < keys->d + keys->nr &&
- src[0].btree_id == src[1].btree_id &&
- src[0].level == src[1].level &&
- bpos_eq(src[0].k->k.p, src[1].k->k.p))
+ !journal_key_cmp(src, src + 1))
src++;
*dst++ = *src++;