[PATCH v2 09/10] bcachefs: Update min_heap_callbacks to use default builtin swap

Kuan-Wei Chiu
2024-10-20T04:03:07Z

Replace the swp function pointer in the min_heap_callbacks of bcachefs
with NULL, allowing direct usage of the default builtin swap
implementation. This modification simplifies the code and improves
performance by removing unnecessary function indirection.

Signed-off-by: Kuan-Wei Chiu <visitorckw@gmail.com>
---
fs/bcachefs/clock.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/fs/bcachefs/clock.c b/fs/bcachefs/clock.c
index 1fcfcb5fd44f..1f8e035d7119 100644
--- a/fs/bcachefs/clock.c
+++ b/fs/bcachefs/clock.c
@@ -14,17 +14,9 @@ static inline bool io_timer_cmp(const void *l, const void *r, void __always_unus
return (*_l)->expire < (*_r)->expire;
}

-static inline void io_timer_swp(void *l, void *r, void __always_unused *args)
-{
- struct io_timer **_l = (struct io_timer **)l;
- struct io_timer **_r = (struct io_timer **)r;
-
- swap(*_l, *_r);
-}
-
static const struct min_heap_callbacks callbacks = {
.less = io_timer_cmp,
- .swp = io_timer_swp,
+ .swp = NULL,
};

void bch2_io_timer_add(struct io_clock *clock, struct io_timer *timer)
--
2.34.1