Commit 1c076f1f authored by Hongzhen Luo's avatar Hongzhen Luo Committed by Gao Xiang
Browse files

erofs: get rid of z_erofs_map_blocks_iter_* tracepoints 



Consolidate them under erofs_map_blocks_* for simplicity since we
have many other ways to know if a given inode is compressed or not.

Signed-off-by: default avatarHongzhen Luo <hongzhen@linux.alibaba.com>
Reviewed-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
Link: https://lore.kernel.org/r/20240710083459.208362-1-hongzhen@linux.alibaba.com


Signed-off-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
parent 84a2ceef

fs/erofs/zmap.c

+2 −2
Original line number Diff line number Diff line
@@ -686,7 +686,7 @@ int z_erofs_map_blocks_iter(struct inode *inode, struct erofs_map_blocks *map, 
	struct erofs_inode *const vi = EROFS_I(inode);

	int err = 0;



	trace_z_erofs_map_blocks_iter_enter(inode, map, flags);

	trace_erofs_map_blocks_enter(inode, map, flags);



	/* when trying to read beyond EOF, leave it unmapped */

	if (map->m_la >= inode->i_size) {
@@ -713,7 +713,7 @@ int z_erofs_map_blocks_iter(struct inode *inode, struct erofs_map_blocks *map, 
out:

	if (err)

		map->m_llen = 0;

	trace_z_erofs_map_blocks_iter_exit(inode, map, flags, err);

	trace_erofs_map_blocks_exit(inode, map, flags, err);

	return err;

}

include/trace/events/erofs.h

+3 −29
Original line number Diff line number Diff line
@@ -143,7 +143,8 @@ TRACE_EVENT(erofs_readpages, 
		__entry->raw)

);



DECLARE_EVENT_CLASS(erofs__map_blocks_enter,

TRACE_EVENT(erofs_map_blocks_enter,



	TP_PROTO(struct inode *inode, struct erofs_map_blocks *map,

		 unsigned int flags),
@@ -171,21 +172,8 @@ DECLARE_EVENT_CLASS(erofs__map_blocks_enter, 
		  __entry->flags ? show_map_flags(__entry->flags) : "NULL")

);



DEFINE_EVENT(erofs__map_blocks_enter, erofs_map_blocks_enter,

	TP_PROTO(struct inode *inode, struct erofs_map_blocks *map,

		 unsigned flags),



	TP_ARGS(inode, map, flags)

);



DEFINE_EVENT(erofs__map_blocks_enter, z_erofs_map_blocks_iter_enter,

	TP_PROTO(struct inode *inode, struct erofs_map_blocks *map,

		 unsigned int flags),



	TP_ARGS(inode, map, flags)

);

TRACE_EVENT(erofs_map_blocks_exit,



DECLARE_EVENT_CLASS(erofs__map_blocks_exit,

	TP_PROTO(struct inode *inode, struct erofs_map_blocks *map,

		 unsigned int flags, int ret),
@@ -223,20 +211,6 @@ DECLARE_EVENT_CLASS(erofs__map_blocks_exit, 
		  show_mflags(__entry->mflags), __entry->ret)

);



DEFINE_EVENT(erofs__map_blocks_exit, erofs_map_blocks_exit,

	TP_PROTO(struct inode *inode, struct erofs_map_blocks *map,

		 unsigned flags, int ret),



	TP_ARGS(inode, map, flags, ret)

);



DEFINE_EVENT(erofs__map_blocks_exit, z_erofs_map_blocks_iter_exit,

	TP_PROTO(struct inode *inode, struct erofs_map_blocks *map,

		 unsigned int flags, int ret),



	TP_ARGS(inode, map, flags, ret)

);



TRACE_EVENT(erofs_destroy_inode,

	TP_PROTO(struct inode *inode),