bcachefs: BCH_COUNTER_bucket_discard_fast

Add a separate counter for fastpath bucket discards, which don't require
a journal flush.

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

diff --git a/fs/bcachefs/alloc_background.c b/fs/bcachefs/alloc_background.c
index 3ea809990ef1a5bd2f9c2d00d56e6deecd08988d..43c29b0d2d2058cf65a4c15edfcc2ad6a9375716 100644 (file)
--- a/fs/bcachefs/alloc_background.c
+++ b/fs/bcachefs/alloc_background.c
@@ -1897,7 +1897,10 @@ commit:
        if (ret)
                goto out;
 
-       count_event(c, bucket_discard);
+       if (!fastpath)
+               count_event(c, bucket_discard);
+       else
+               count_event(c, bucket_discard_fast);
 out:
 fsck_err:
        if (discard_locked)

diff --git a/fs/bcachefs/sb-counters_format.h b/fs/bcachefs/sb-counters_format.h
index cb44d9ee1ac5747a90389ac22ffd15a057c522f4..d0391c5d4c48721ba2d0eeb76637fbcfcaafae9e 100644 (file)
--- a/fs/bcachefs/sb-counters_format.h
+++ b/fs/bcachefs/sb-counters_format.h
@@ -13,6 +13,7 @@ enum counters_flags {
        x(io_move,                                      2,      TYPE_SECTORS)   \
        x(bucket_invalidate,                            3,      TYPE_COUNTER)   \
        x(bucket_discard,                               4,      TYPE_COUNTER)   \
+       x(bucket_discard_fast,                          79,     TYPE_COUNTER)   \
        x(bucket_alloc,                                 5,      TYPE_COUNTER)   \
        x(bucket_alloc_fail,                            6,      TYPE_COUNTER)   \
        x(btree_cache_scan,                             7,      TYPE_COUNTER)   \