From: Kent Overstreet Date: Thu, 28 Dec 2023 01:31:21 +0000 (-0500) Subject: bcachefs: __journal_keys_sort() refactoring X-Git-Tag: v6.8-rc1~137^2~42 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f412392f6ea3168c0b9730532bc6298c07c4e378;p=thirdparty%2Fkernel%2Flinux.git bcachefs: __journal_keys_sort() refactoring Signed-off-by: Kent Overstreet --- diff --git a/fs/bcachefs/btree_journal_iter.c b/fs/bcachefs/btree_journal_iter.c index 4c084ce493a4a..719a94a84950b 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++;