Commit 0b95aaae authored Oct 17, 2019 by Qu Wenruo Committed by Greg Kroah-Hartman Oct 29, 2019

btrfs: tracepoints: Fix bad entry members of qgroup events



commit 1b2442b4ae0f234daeadd90e153b466332c466d8 upstream.

[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: 4ee0d883 ("btrfs: qgroup: Update trace events for metadata reservation")
CC: stable@vger.kernel.org # 4.10+
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 1b921b5b

include/trace/events/btrfs.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -1655,6 +1655,7 @@ TRACE_EVENT(qgroup_update_reserve,
		__entry->qgid = qgroup->qgroupid;
		__entry->cur_reserved = qgroup->rsv.values[type];
		__entry->diff = diff;
		__entry->type = type;
		),

		TP_printk_btrfs("qgid=%llu type=%s cur_reserved=%llu diff=%lld",
		@@ -1677,6 +1678,7 @@ TRACE_EVENT(qgroup_meta_reserve,
		TP_fast_assign_btrfs(root->fs_info,
		__entry->refroot = root->objectid;
		__entry->diff = diff;
		__entry->type = type;
		),

		TP_printk_btrfs("refroot=%llu(%s) type=%s diff=%lld",
		@@ -1693,7 +1695,6 @@ TRACE_EVENT(qgroup_meta_convert,
		TP_STRUCT__entry_btrfs(
		__field( u64, refroot )
		__field( s64, diff )
		__field( int, type )
		),

		TP_fast_assign_btrfs(root->fs_info,