Update bcachefs sources to b12d1535f3 bcachefs: fix bounds checks in bch2_bio_map()

[bcachefs-tools-debian] / libbcachefs / clock.c

diff --git a/libbcachefs/clock.c b/libbcachefs/clock.c
index c67376f96f5ae635d63840654f4254db6226d5a6..90b10cef60b8ccd06abc9f903677ad6e5d96779c 100644 (file)
--- a/libbcachefs/clock.c
+++ b/libbcachefs/clock.c
@@ -21,7 +21,7 @@ void bch2_io_timer_add(struct io_clock *clock, struct io_timer *timer)
                if (clock->timers.data[i] == timer)
                        goto out;
 
-       BUG_ON(!heap_add(&clock->timers, timer, io_timer_cmp));
+       BUG_ON(!heap_add(&clock->timers, timer, io_timer_cmp, NULL));
 out:
        spin_unlock(&clock->timer_lock);
 }
@@ -34,7 +34,7 @@ void bch2_io_timer_del(struct io_clock *clock, struct io_timer *timer)
 
        for (i = 0; i < clock->timers.used; i++)
                if (clock->timers.data[i] == timer) {
-                       heap_del(&clock->timers, i, io_timer_cmp);
+                       heap_del(&clock->timers, i, io_timer_cmp, NULL);
                        break;
                }
 
@@ -127,7 +127,7 @@ static struct io_timer *get_expired_timer(struct io_clock *clock,
 
        if (clock->timers.used &&
            time_after_eq(now, clock->timers.data[0]->expire))
-               heap_pop(&clock->timers, ret, io_timer_cmp);
+               heap_pop(&clock->timers, ret, io_timer_cmp, NULL);
 
        spin_unlock(&clock->timer_lock);