Update bcachefs sources to 6a20aede29 bcachefs: Fix quotas + snapshots

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

diff --git a/include/trace/events/bcachefs.h b/libbcachefs/trace.h
similarity index 98%
rename from include/trace/events/bcachefs.h
rename to libbcachefs/trace.h
index e8cfae6bdbb4ac9750d729d1d7a6951117b3433b..8027c2a14199bc02db05fc73cd8b379b6cf2d330 100644 (file)
--- a/include/trace/events/bcachefs.h
+++ b/libbcachefs/trace.h
@@ -2,8 +2,8 @@
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM bcachefs
 
-#if !defined(_TRACE_BCACHE_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_BCACHE_H
+#if !defined(_TRACE_BCACHEFS_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_BCACHEFS_H
 
 #include <linux/tracepoint.h>
 
@@ -663,7 +663,7 @@ TRACE_EVENT(bucket_invalidate,
 /* Moving IO */
 
 TRACE_EVENT(bucket_evacuate,
-       TP_PROTO(struct bch_fs *c, struct bpos bucket),
+       TP_PROTO(struct bch_fs *c, struct bpos *bucket),
        TP_ARGS(c, bucket),
 
        TP_STRUCT__entry(
@@ -674,8 +674,8 @@ TRACE_EVENT(bucket_evacuate,
 
        TP_fast_assign(
                __entry->dev            = c->dev;
-               __entry->dev_idx        = bucket.inode;
-               __entry->bucket         = bucket.offset;
+               __entry->dev_idx        = bucket->inode;
+               __entry->bucket         = bucket->offset;
        ),
 
        TP_printk("%d:%d %u:%llu",
@@ -1250,7 +1250,13 @@ TRACE_EVENT(write_buffer_flush_slowpath,
        TP_printk("%zu/%zu", __entry->nr, __entry->size)
 );
 
-#endif /* _TRACE_BCACHE_H */
+#endif /* _TRACE_BCACHEFS_H */
 
 /* This part must be outside protection */
+#undef TRACE_INCLUDE_PATH
+#define TRACE_INCLUDE_PATH ../../fs/bcachefs
+
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_FILE trace
+
 #include <trace/define_trace.h>