Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3dca5c94 authored by Qu Wenruo's avatar Qu Wenruo Committed by David Sterba
Browse files

btrfs: trace: Remove unnecessary fs_info parameter for btrfs__reserve_extent event class 



fs_info can be extracted from btrfs_block_group_cache, and all
btrfs_block_group_cache is created by btrfs_create_block_group_cache()
with fs_info initialized, no need to worry about NULL pointer
dereference.

Signed-off-by: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 9113493e

fs/btrfs/extent-tree.c

+3 −4
Original line number Diff line number Diff line
@@ -7651,7 +7651,7 @@ static noinline int find_free_extent(struct btrfs_fs_info *fs_info, 
			if (offset) {

				/* we have a block, we're done */

				spin_unlock(&last_ptr->refill_lock);

				trace_btrfs_reserve_extent_cluster(fs_info,

				trace_btrfs_reserve_extent_cluster(

						used_block_group,

						search_start, num_bytes);

				if (used_block_group != block_group) {
@@ -7724,7 +7724,7 @@ static noinline int find_free_extent(struct btrfs_fs_info *fs_info, 
				if (offset) {

					/* we found one, proceed */

					spin_unlock(&last_ptr->refill_lock);

					trace_btrfs_reserve_extent_cluster(fs_info,

					trace_btrfs_reserve_extent_cluster(

						block_group, search_start,

						num_bytes);

					goto checks;
@@ -7824,8 +7824,7 @@ static noinline int find_free_extent(struct btrfs_fs_info *fs_info, 
		ins->objectid = search_start;

		ins->offset = num_bytes;



		trace_btrfs_reserve_extent(fs_info, block_group,

					   search_start, num_bytes);

		trace_btrfs_reserve_extent(block_group, search_start, num_bytes);

		btrfs_release_block_group(block_group, delalloc);

		break;

loop:

include/trace/events/btrfs.h

+8 −10
Original line number Diff line number Diff line
@@ -1146,11 +1146,10 @@ TRACE_EVENT(find_free_extent, 


DECLARE_EVENT_CLASS(btrfs__reserve_extent,



	TP_PROTO(const struct btrfs_fs_info *fs_info,

		 const struct btrfs_block_group_cache *block_group, u64 start,

	TP_PROTO(const struct btrfs_block_group_cache *block_group, u64 start,

		 u64 len),



	TP_ARGS(fs_info, block_group, start, len),

	TP_ARGS(block_group, start, len),



	TP_STRUCT__entry_btrfs(

		__field(	u64,	bg_objectid		)
@@ -1159,7 +1158,7 @@ DECLARE_EVENT_CLASS(btrfs__reserve_extent, 
		__field(	u64,	len			)

	),



	TP_fast_assign_btrfs(fs_info,

	TP_fast_assign_btrfs(block_group->fs_info,

		__entry->bg_objectid	= block_group->key.objectid;

		__entry->flags		= block_group->flags;

		__entry->start		= start;
@@ -1177,20 +1176,18 @@ DECLARE_EVENT_CLASS(btrfs__reserve_extent, 


DEFINE_EVENT(btrfs__reserve_extent, btrfs_reserve_extent,



	TP_PROTO(const struct btrfs_fs_info *fs_info,

		 const struct btrfs_block_group_cache *block_group, u64 start,

	TP_PROTO(const struct btrfs_block_group_cache *block_group, u64 start,

		 u64 len),



	TP_ARGS(fs_info, block_group, start, len)

	TP_ARGS(block_group, start, len)

);



DEFINE_EVENT(btrfs__reserve_extent, btrfs_reserve_extent_cluster,



	TP_PROTO(const struct btrfs_fs_info *fs_info,

		 const struct btrfs_block_group_cache *block_group, u64 start,

	TP_PROTO(const struct btrfs_block_group_cache *block_group, u64 start,

		 u64 len),



	TP_ARGS(fs_info, block_group, start, len)

	TP_ARGS(block_group, start, len)

);



TRACE_EVENT(btrfs_find_cluster,
@@ -1807,6 +1804,7 @@ TRACE_EVENT(btrfs_inode_mod_outstanding_extents, 
			show_root_type(__entry->root_objectid),

			__entry->ino, __entry->mod)

);



#endif /* _TRACE_BTRFS_H */



/* This part must be outside protection */