erofs: get rid of z_erofs_map_blocks_iter_* tracepoints
Subsystems (2)
PATCH 1/1 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 Hongzhen Luo <[email protected]>
--- fs/erofs/zmap.c | 4 ++-- include/trace/events/erofs.h | 32 +++----------------------------- 2 files changed, 5 insertions(+), 31 deletions(-)
fs/erofs/zmap.c +2 -2
@@ -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
@@ -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),
Signature · 1 line
2.43.5
Quoted 4 lines · Hongzhen Luo
Consolidate them under erofs_map_blocks_* for simplicity since we have many other ways to know if a given inode is compressed or not.
Redundant blank line. I will remove it manually.
Quoted 1 line
Signed-off-by Hongzhen Luo <[email protected]>
Otherwise it looks good to me,
Reviewed-by Gao Xiang <[email protected]>
Thanks,
Gao Xiang