ext4: convert ext4_fc_track_dentry type events to use event class
authorRitesh Harjani <riteshh@linux.ibm.com>
Sat, 12 Mar 2022 05:39:48 +0000 (11:09 +0530)
committerTheodore Ts'o <tytso@mit.edu>
Sun, 13 Mar 2022 02:26:08 +0000 (21:26 -0500)
One should use DECLARE_EVENT_CLASS for similar event types instead of
defining TRACE_EVENT for each event type. This is helpful in reducing
the text section footprint for e.g. [1]

[1]: https://lwn.net/Articles/381064/

Signed-off-by: Ritesh Harjani <riteshh@linux.ibm.com>
Reviewed-by: Harshad Shirwadkar <harshadshirwadkar@gmail.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/a019cb46219ef4b30e4d98d7ced7d8819a2fc61d.1647057583.git.riteshh@linux.ibm.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
include/trace/events/ext4.h

index 1a0b703..3d48fcb 100644 (file)
@@ -2780,33 +2780,39 @@ TRACE_EVENT(ext4_fc_stats,
                  __entry->fc_numblks)
 );
 
-#define DEFINE_TRACE_DENTRY_EVENT(__type)                              \
-       TRACE_EVENT(ext4_fc_track_##__type,                             \
-           TP_PROTO(struct inode *inode, struct dentry *dentry, int ret), \
-                                                                       \
-           TP_ARGS(inode, dentry, ret),                                \
-                                                                       \
-           TP_STRUCT__entry(                                           \
-                   __field(dev_t, dev)                                 \
-                   __field(int, ino)                                   \
-                   __field(int, error)                                 \
-                   ),                                                  \
-                                                                       \
-           TP_fast_assign(                                             \
-                   __entry->dev = inode->i_sb->s_dev;                  \
-                   __entry->ino = inode->i_ino;                        \
-                   __entry->error = ret;                               \
-                   ),                                                  \
-                                                                       \
-           TP_printk("dev %d:%d, inode %d, error %d, fc_%s",           \
-                     MAJOR(__entry->dev), MINOR(__entry->dev),         \
-                     __entry->ino, __entry->error,                     \
-                     #__type)                                          \
+DECLARE_EVENT_CLASS(ext4_fc_track_dentry,
+
+       TP_PROTO(struct inode *inode, struct dentry *dentry, int ret),
+
+       TP_ARGS(inode, dentry, ret),
+
+       TP_STRUCT__entry(
+               __field(dev_t, dev)
+               __field(ino_t, i_ino)
+               __field(int, error)
+       ),
+
+       TP_fast_assign(
+               __entry->dev = inode->i_sb->s_dev;
+               __entry->i_ino = inode->i_ino;
+               __entry->error = ret;
+       ),
+
+       TP_printk("dev %d,%d, ino %lu, error %d",
+                 MAJOR(__entry->dev), MINOR(__entry->dev),
+                 __entry->i_ino, __entry->error
        )
+);
+
+#define DEFINE_EVENT_CLASS_DENTRY(__type)                              \
+DEFINE_EVENT(ext4_fc_track_dentry, ext4_fc_track_##__type,             \
+       TP_PROTO(struct inode *inode, struct dentry *dentry, int ret),  \
+       TP_ARGS(inode, dentry, ret)                                     \
+)
 
-DEFINE_TRACE_DENTRY_EVENT(create);
-DEFINE_TRACE_DENTRY_EVENT(link);
-DEFINE_TRACE_DENTRY_EVENT(unlink);
+DEFINE_EVENT_CLASS_DENTRY(create);
+DEFINE_EVENT_CLASS_DENTRY(link);
+DEFINE_EVENT_CLASS_DENTRY(unlink);
 
 TRACE_EVENT(ext4_fc_track_inode,
            TP_PROTO(struct inode *inode, int ret),