Update bcachefs sources to 3856459b1b bcachefs: bch2_btree_iter_peek_node_and_restart()

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

diff --git a/libbcachefs/clock.c b/libbcachefs/clock.c
index f3ffdbc38485baacb66cdd39097e4018440b0fd0..00d0e6725910155f1adbef4ebe375db493ff0de1 100644 (file)
--- a/libbcachefs/clock.c
+++ b/libbcachefs/clock.c
@@ -122,7 +122,7 @@ void bch2_kthread_io_clock_wait(struct io_clock *clock,
        }
 
        __set_current_state(TASK_RUNNING);
-       del_singleshot_timer_sync(&wait.cpu_timer);
+       del_timer_sync(&wait.cpu_timer);
        destroy_timer_on_stack(&wait.cpu_timer);
        bch2_io_timer_del(clock, &wait.io_timer);
 }
@@ -157,6 +157,7 @@ void bch2_io_timers_to_text(struct printbuf *out, struct io_clock *clock)
        unsigned long now;
        unsigned i;
 
+       out->atomic++;
        spin_lock(&clock->timer_lock);
        now = atomic64_read(&clock->now);
 
@@ -165,6 +166,7 @@ void bch2_io_timers_to_text(struct printbuf *out, struct io_clock *clock)
                       clock->timers.data[i]->fn,
                       clock->timers.data[i]->expire - now);
        spin_unlock(&clock->timer_lock);
+       --out->atomic;
 }
 
 void bch2_io_clock_exit(struct io_clock *clock)