Disable pristine-tar option in gbp.conf, since there is no pristine-tar branch.

[bcachefs-tools-debian] / libbcachefs / clock_types.h

diff --git a/libbcachefs/clock_types.h b/libbcachefs/clock_types.h
index 2b5e499e12b43cee088004fb1f8fd9ad5e9f34de..5fae0012d808f7a1b5f4e5334804eee50c31d577 100644 (file)
--- a/libbcachefs/clock_types.h
+++ b/libbcachefs/clock_types.h
@@ -26,8 +26,9 @@ struct io_timer {
 typedef HEAP(struct io_timer *)        io_timer_heap;
 
 struct io_clock {
-       atomic_long_t           now;
+       atomic64_t              now;
        u16 __percpu            *pcpu_buf;
+       unsigned                max_slop;
 
        spinlock_t              timer_lock;
        io_timer_heap           timers;