Update bcachefs sources to b9bd69421f73 bcachefs: x-macro-ify inode flags enum

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

diff --git a/libbcachefs/clock.h b/libbcachefs/clock.h
index 1e2a7dea4ddd0a0fe5c7c35695c502aa662ecb4b..70a0f7436c844f2f4ce2b29c35fc8a250920e9b9 100644 (file)
--- a/libbcachefs/clock.h
+++ b/libbcachefs/clock.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef _BCACHEFS_CLOCK_H
 #define _BCACHEFS_CLOCK_H
 
@@ -5,7 +6,18 @@ void bch2_io_timer_add(struct io_clock *, struct io_timer *);
 void bch2_io_timer_del(struct io_clock *, struct io_timer *);
 void bch2_kthread_io_clock_wait(struct io_clock *, unsigned long,
                                unsigned long);
-void bch2_increment_clock(struct bch_fs *, unsigned, int);
+
+void __bch2_increment_clock(struct io_clock *, unsigned);
+
+static inline void bch2_increment_clock(struct bch_fs *c, unsigned sectors,
+                                       int rw)
+{
+       struct io_clock *clock = &c->io_clock[rw];
+
+       if (unlikely(this_cpu_add_return(*clock->pcpu_buf, sectors) >=
+                  IO_CLOCK_PCPU_SECTORS))
+               __bch2_increment_clock(clock, this_cpu_xchg(*clock->pcpu_buf, 0));
+}
 
 void bch2_io_clock_schedule_timeout(struct io_clock *, unsigned long);
 
@@ -18,6 +30,8 @@ void bch2_io_clock_schedule_timeout(struct io_clock *, unsigned long);
        __ret;                                                          \
 })
 
+void bch2_io_timers_to_text(struct printbuf *, struct io_clock *);
+
 void bch2_io_clock_exit(struct io_clock *);
 int bch2_io_clock_init(struct io_clock *);