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 4a02f46716031b998a22923deb188557c7409c81..5fae0012d808f7a1b5f4e5334804eee50c31d577 100644 (file)
--- a/libbcachefs/clock_types.h
+++ b/libbcachefs/clock_types.h
@@ -1,9 +1,10 @@
-#ifndef _BCACHE_CLOCK_TYPES_H
-#define _BCACHE_CLOCK_TYPES_H
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _BCACHEFS_CLOCK_TYPES_H
+#define _BCACHEFS_CLOCK_TYPES_H
 
 #include "util.h"
 
-#define NR_IO_TIMERS           8
+#define NR_IO_TIMERS           (BCH_SB_MEMBERS_MAX * 3)
 
 /*
  * Clocks/timers in units of sectors of IO:
@@ -22,13 +23,15 @@ struct io_timer {
 /* Amount to buffer up on a percpu counter */
 #define IO_CLOCK_PCPU_SECTORS  128
 
+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;
-       DECLARE_HEAP(struct io_timer *, timers);
+       io_timer_heap           timers;
 };
 
-#endif /* _BCACHE_CLOCK_TYPES_H */
-
+#endif /* _BCACHEFS_CLOCK_TYPES_H */