Skip to content

Commit 1b2442b

Browse files
adam900710kdave
authored andcommitted
btrfs: tracepoints: Fix bad entry members of qgroup events
[BUG] For btrfs:qgroup_meta_reserve event, the trace event can output garbage: qgroup_meta_reserve: 9c7f6acc-b342-4037-bc47-7f6e4d2232d7: refroot=5(FS_TREE) type=DATA diff=2 qgroup_meta_reserve: 9c7f6acc-b342-4037-bc47-7f6e4d2232d7: refroot=5(FS_TREE) type=0x258792 diff=2 The @type can be completely garbage, as DATA type is not possible for trace_qgroup_meta_reserve() trace event. [CAUSE] Ther are several problems related to qgroup trace events: - Unassigned entry member Member entry::type of trace_qgroup_update_reserve() and trace_qgourp_meta_reserve() is not assigned - Redundant entry member Member entry::type is completely useless in trace_qgroup_meta_convert() Fixes: 4ee0d88 ("btrfs: qgroup: Update trace events for metadata reservation") CC: [email protected] # 4.10+ Reviewed-by: Nikolay Borisov <[email protected]> Signed-off-by: Qu Wenruo <[email protected]> Reviewed-by: David Sterba <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent fd2b007 commit 1b2442b

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

include/trace/events/btrfs.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1688,6 +1688,7 @@ TRACE_EVENT(qgroup_update_reserve,
16881688
__entry->qgid = qgroup->qgroupid;
16891689
__entry->cur_reserved = qgroup->rsv.values[type];
16901690
__entry->diff = diff;
1691+
__entry->type = type;
16911692
),
16921693

16931694
TP_printk_btrfs("qgid=%llu type=%s cur_reserved=%llu diff=%lld",
@@ -1710,6 +1711,7 @@ TRACE_EVENT(qgroup_meta_reserve,
17101711
TP_fast_assign_btrfs(root->fs_info,
17111712
__entry->refroot = root->root_key.objectid;
17121713
__entry->diff = diff;
1714+
__entry->type = type;
17131715
),
17141716

17151717
TP_printk_btrfs("refroot=%llu(%s) type=%s diff=%lld",
@@ -1726,7 +1728,6 @@ TRACE_EVENT(qgroup_meta_convert,
17261728
TP_STRUCT__entry_btrfs(
17271729
__field( u64, refroot )
17281730
__field( s64, diff )
1729-
__field( int, type )
17301731
),
17311732

17321733
TP_fast_assign_btrfs(root->fs_info,

0 commit comments

Comments
 (0)