|
@@ -353,7 +353,7 @@ TRACE_EVENT(ext4_discard_blocks,
|
|
jbd2_dev_to_name(__entry->dev), __entry->blk, __entry->count)
|
|
jbd2_dev_to_name(__entry->dev), __entry->blk, __entry->count)
|
|
);
|
|
);
|
|
|
|
|
|
-TRACE_EVENT(ext4_mb_new_inode_pa,
|
|
|
|
|
|
+DECLARE_EVENT_CLASS(ext4__mb_new_pa,
|
|
TP_PROTO(struct ext4_allocation_context *ac,
|
|
TP_PROTO(struct ext4_allocation_context *ac,
|
|
struct ext4_prealloc_space *pa),
|
|
struct ext4_prealloc_space *pa),
|
|
|
|
|
|
@@ -381,32 +381,20 @@ TRACE_EVENT(ext4_mb_new_inode_pa,
|
|
__entry->pa_pstart, __entry->pa_len, __entry->pa_lstart)
|
|
__entry->pa_pstart, __entry->pa_len, __entry->pa_lstart)
|
|
);
|
|
);
|
|
|
|
|
|
-TRACE_EVENT(ext4_mb_new_group_pa,
|
|
|
|
|
|
+DEFINE_EVENT(ext4__mb_new_pa, ext4_mb_new_inode_pa,
|
|
|
|
+
|
|
TP_PROTO(struct ext4_allocation_context *ac,
|
|
TP_PROTO(struct ext4_allocation_context *ac,
|
|
struct ext4_prealloc_space *pa),
|
|
struct ext4_prealloc_space *pa),
|
|
|
|
|
|
- TP_ARGS(ac, pa),
|
|
|
|
-
|
|
|
|
- TP_STRUCT__entry(
|
|
|
|
- __field( dev_t, dev )
|
|
|
|
- __field( ino_t, ino )
|
|
|
|
- __field( __u64, pa_pstart )
|
|
|
|
- __field( __u32, pa_len )
|
|
|
|
- __field( __u64, pa_lstart )
|
|
|
|
|
|
+ TP_ARGS(ac, pa)
|
|
|
|
+);
|
|
|
|
|
|
- ),
|
|
|
|
|
|
+DEFINE_EVENT(ext4__mb_new_pa, ext4_mb_new_group_pa,
|
|
|
|
|
|
- TP_fast_assign(
|
|
|
|
- __entry->dev = ac->ac_sb->s_dev;
|
|
|
|
- __entry->ino = ac->ac_inode->i_ino;
|
|
|
|
- __entry->pa_pstart = pa->pa_pstart;
|
|
|
|
- __entry->pa_len = pa->pa_len;
|
|
|
|
- __entry->pa_lstart = pa->pa_lstart;
|
|
|
|
- ),
|
|
|
|
|
|
+ TP_PROTO(struct ext4_allocation_context *ac,
|
|
|
|
+ struct ext4_prealloc_space *pa),
|
|
|
|
|
|
- TP_printk("dev %s ino %lu pstart %llu len %u lstart %llu",
|
|
|
|
- jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
|
|
|
|
- __entry->pa_pstart, __entry->pa_len, __entry->pa_lstart)
|
|
|
|
|
|
+ TP_ARGS(ac, pa)
|
|
);
|
|
);
|
|
|
|
|
|
TRACE_EVENT(ext4_mb_release_inode_pa,
|
|
TRACE_EVENT(ext4_mb_release_inode_pa,
|
|
@@ -790,7 +778,7 @@ TRACE_EVENT(ext4_mballoc_prealloc,
|
|
__entry->result_len, __entry->result_logical)
|
|
__entry->result_len, __entry->result_logical)
|
|
);
|
|
);
|
|
|
|
|
|
-TRACE_EVENT(ext4_mballoc_discard,
|
|
|
|
|
|
+DECLARE_EVENT_CLASS(ext4__mballoc,
|
|
TP_PROTO(struct ext4_allocation_context *ac),
|
|
TP_PROTO(struct ext4_allocation_context *ac),
|
|
|
|
|
|
TP_ARGS(ac),
|
|
TP_ARGS(ac),
|
|
@@ -819,33 +807,18 @@ TRACE_EVENT(ext4_mballoc_discard,
|
|
__entry->result_len, __entry->result_logical)
|
|
__entry->result_len, __entry->result_logical)
|
|
);
|
|
);
|
|
|
|
|
|
-TRACE_EVENT(ext4_mballoc_free,
|
|
|
|
|
|
+DEFINE_EVENT(ext4__mballoc, ext4_mballoc_discard,
|
|
|
|
+
|
|
TP_PROTO(struct ext4_allocation_context *ac),
|
|
TP_PROTO(struct ext4_allocation_context *ac),
|
|
|
|
|
|
- TP_ARGS(ac),
|
|
|
|
|
|
+ TP_ARGS(ac)
|
|
|
|
+);
|
|
|
|
|
|
- TP_STRUCT__entry(
|
|
|
|
- __field( dev_t, dev )
|
|
|
|
- __field( ino_t, ino )
|
|
|
|
- __field( __u32, result_logical )
|
|
|
|
- __field( int, result_start )
|
|
|
|
- __field( __u32, result_group )
|
|
|
|
- __field( int, result_len )
|
|
|
|
- ),
|
|
|
|
|
|
+DEFINE_EVENT(ext4__mballoc, ext4_mballoc_free,
|
|
|
|
|
|
- TP_fast_assign(
|
|
|
|
- __entry->dev = ac->ac_inode->i_sb->s_dev;
|
|
|
|
- __entry->ino = ac->ac_inode->i_ino;
|
|
|
|
- __entry->result_logical = ac->ac_b_ex.fe_logical;
|
|
|
|
- __entry->result_start = ac->ac_b_ex.fe_start;
|
|
|
|
- __entry->result_group = ac->ac_b_ex.fe_group;
|
|
|
|
- __entry->result_len = ac->ac_b_ex.fe_len;
|
|
|
|
- ),
|
|
|
|
|
|
+ TP_PROTO(struct ext4_allocation_context *ac),
|
|
|
|
|
|
- TP_printk("dev %s inode %lu extent %u/%d/%u@%u ",
|
|
|
|
- jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
|
|
|
|
- __entry->result_group, __entry->result_start,
|
|
|
|
- __entry->result_len, __entry->result_logical)
|
|
|
|
|
|
+ TP_ARGS(ac)
|
|
);
|
|
);
|
|
|
|
|
|
TRACE_EVENT(ext4_forget,
|
|
TRACE_EVENT(ext4_forget,
|