Move c_src dirs back to toplevel

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

diff --git a/libbcachefs/clock.c b/libbcachefs/clock.c
index 1d1590de55e85b9a484882104057ecfc7a7a6478..f41889093a2c7eacaa1723667fc7bb2af5d0f3aa 100644 (file)
--- a/libbcachefs/clock.c
+++ b/libbcachefs/clock.c
@@ -19,7 +19,7 @@ void bch2_io_timer_add(struct io_clock *clock, struct io_timer *timer)
 
        spin_lock(&clock->timer_lock);
 
-       if (time_after_eq((unsigned long) atomic_long_read(&clock->now),
+       if (time_after_eq((unsigned long) atomic64_read(&clock->now),
                          timer->expire)) {
                spin_unlock(&clock->timer_lock);
                timer->fn(timer);
@@ -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);
 }
@@ -146,7 +146,7 @@ static struct io_timer *get_expired_timer(struct io_clock *clock,
 void __bch2_increment_clock(struct io_clock *clock, unsigned sectors)
 {
        struct io_timer *timer;
-       unsigned long now = atomic_long_add_return(sectors, &clock->now);
+       unsigned long now = atomic64_add_return(sectors, &clock->now);
 
        while ((timer = get_expired_timer(clock, now)))
                timer->fn(timer);
@@ -157,14 +157,16 @@ 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 = atomic_long_read(&clock->now);
+       now = atomic64_read(&clock->now);
 
        for (i = 0; i < clock->timers.used; i++)
-               pr_buf(out, "%ps:\t%li\n",
+               prt_printf(out, "%ps:\t%li\n",
                       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)
@@ -175,17 +177,17 @@ void bch2_io_clock_exit(struct io_clock *clock)
 
 int bch2_io_clock_init(struct io_clock *clock)
 {
-       atomic_long_set(&clock->now, 0);
+       atomic64_set(&clock->now, 0);
        spin_lock_init(&clock->timer_lock);
 
        clock->max_slop = IO_CLOCK_PCPU_SECTORS * num_possible_cpus();
 
        clock->pcpu_buf = alloc_percpu(*clock->pcpu_buf);
        if (!clock->pcpu_buf)
-               return -ENOMEM;
+               return -BCH_ERR_ENOMEM_io_clock_init;
 
        if (!init_heap(&clock->timers, NR_IO_TIMERS, GFP_KERNEL))
-               return -ENOMEM;
+               return -BCH_ERR_ENOMEM_io_clock_init;
 
        return 0;
 }