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 ae068c6d7acb2ecbc313662a91e445f7ee0a97b2..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:
@@ -25,12 +26,12 @@ 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;
 };
 
-#endif /* _BCACHE_CLOCK_TYPES_H */
-
+#endif /* _BCACHEFS_CLOCK_TYPES_H */