bcachefs: count_event()

Small helper for event counters.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/alloc_background.c b/fs/bcachefs/alloc_background.c
index ccc3779dd366bcbeec782b022c15eab05bac5e0f..6e719dd09e31ce663e37195af72f4692a0e99fda 100644 (file)
--- a/fs/bcachefs/alloc_background.c
+++ b/fs/bcachefs/alloc_background.c
@@ -1674,7 +1674,7 @@ write:
        if (ret)
                goto out;
 
-       this_cpu_inc(c->counters[BCH_COUNTER_bucket_discard]);
+       count_event(c, bucket_discard);
        (*discarded)++;
 out:
        (*seen)++;

diff --git a/fs/bcachefs/bcachefs.h b/fs/bcachefs/bcachefs.h
index 4186779f1e44af4956092c5d15da1ead52296ba0..06b5cea9980e417b3f8e66faad793fa98502f461 100644 (file)
--- a/fs/bcachefs/bcachefs.h
+++ b/fs/bcachefs/bcachefs.h
@@ -223,9 +223,11 @@
 
 #define race_fault(...)                        dynamic_fault("bcachefs:race")
 
+#define count_event(_c, _name) this_cpu_inc((_c)->counters[BCH_COUNTER_##_name])
+
 #define trace_and_count(_c, _name, ...)                                        \
 do {                                                                   \
-       this_cpu_inc((_c)->counters[BCH_COUNTER_##_name]);              \
+       count_event(_c, _name);                                         \
        trace_##_name(__VA_ARGS__);                                     \
 } while (0)
 

diff --git a/fs/bcachefs/data_update.c b/fs/bcachefs/data_update.c
index 488279b3d08e512b58281e3a5dabe6d248ab563c..59b558c2597796eb047437065d846f4f6939ee81 100644 (file)
--- a/fs/bcachefs/data_update.c
+++ b/fs/bcachefs/data_update.c
@@ -321,7 +321,7 @@ nowork:
                                     &m->stats->sectors_raced);
                }
 
-               this_cpu_inc(c->counters[BCH_COUNTER_move_extent_fail]);
+               count_event(c, move_extent_fail);
 
                bch2_btree_iter_advance(&iter);
                goto next;

diff --git a/fs/bcachefs/move.c b/fs/bcachefs/move.c
index eafa80c18ba44c3e89f791d7002145e79ef1f30a..a6db46a70f15760d0eca4f3e9867f574281848eb 100644 (file)
--- a/fs/bcachefs/move.c
+++ b/fs/bcachefs/move.c
@@ -349,7 +349,8 @@ err:
            bch2_err_matches(ret, BCH_ERR_transaction_restart))
                return ret;
 
-       this_cpu_inc(c->counters[BCH_COUNTER_move_extent_start_fail]);
+       count_event(c, move_extent_start_fail);
+
        if (trace_move_extent_start_fail_enabled()) {
                struct printbuf buf = PRINTBUF;