Delete more unused shim code, update bcache code

[bcachefs-tools-debian] / include / trace / events / bcache.h

diff --git a/include/trace/events/bcache.h b/include/trace/events/bcache.h
index 01e4b79d408bea1701da274098a6bfe94dd61546..06ce0218259ca4433874c2b066e9876b8d3a15a3 100644 (file)
--- a/include/trace/events/bcache.h
+++ b/include/trace/events/bcache.h
@@ -348,12 +348,12 @@ DEFINE_EVENT(bcache_bio, bcache_journal_write,
 
 /* Device state changes */
 
-DEFINE_EVENT(cache_set, bcache_cache_set_read_only,
+DEFINE_EVENT(cache_set, fs_read_only,
        TP_PROTO(struct cache_set *c),
        TP_ARGS(c)
 );
 
-DEFINE_EVENT(cache_set, bcache_cache_set_read_only_done,
+DEFINE_EVENT(cache_set, fs_read_only_done,
        TP_PROTO(struct cache_set *c),
        TP_ARGS(c)
 );
@@ -896,7 +896,7 @@ DEFINE_EVENT(cache_bucket_alloc, bcache_bucket_alloc_fail,
        TP_ARGS(ca, reserve)
 );
 
-DECLARE_EVENT_CLASS(cache_set_bucket_alloc,
+TRACE_EVENT(bcache_freelist_empty_fail,
        TP_PROTO(struct cache_set *c, enum alloc_reserve reserve,
                 struct closure *cl),
        TP_ARGS(c, reserve, cl),
@@ -917,12 +917,6 @@ DECLARE_EVENT_CLASS(cache_set_bucket_alloc,
                  __entry->cl)
 );
 
-DEFINE_EVENT(cache_set_bucket_alloc, bcache_freelist_empty_fail,
-       TP_PROTO(struct cache_set *c, enum alloc_reserve reserve,
-                struct closure *cl),
-       TP_ARGS(c, reserve, cl)
-);
-
 DECLARE_EVENT_CLASS(open_bucket_alloc,
        TP_PROTO(struct cache_set *c, struct closure *cl),
        TP_ARGS(c, cl),