Re: [PATCH v2 9/9] ext4: remove 'needed' in trace_ext4_discard_preallocations

[Jan Kara]

On Wed 03-01-24 18:28:21, Kemeng Shi wrote:
> As 'needed' to trace_ext4_discard_preallocations is always 0 which
> is meaningless. Just remove it.
> 
> Signed-off-by: Kemeng Shi <shikemeng@xxxxxxxxxxxxxxx>
> Suggested-by: Jan Kara <jack@xxxxxxx>

Looks good. Feel free to add:

Reviewed-by: Jan Kara <jack@xxxxxxx>

								Honza

> ---
>  fs/ext4/mballoc.c           |  5 ++---
>  include/trace/events/ext4.h | 11 ++++-------
>  2 files changed, 6 insertions(+), 10 deletions(-)
> 
> diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
> index 0e6beb3b4..091a832a8 100644
> --- a/fs/ext4/mballoc.c
> +++ b/fs/ext4/mballoc.c
> @@ -5481,9 +5481,8 @@ void ext4_discard_preallocations(struct inode *inode)
>  	struct rb_node *iter;
>  	int err;
>  
> -	if (!S_ISREG(inode->i_mode)) {
> +	if (!S_ISREG(inode->i_mode))
>  		return;
> -	}
>  
>  	if (EXT4_SB(sb)->s_mount_state & EXT4_FC_REPLAY)
>  		return;
> @@ -5491,7 +5490,7 @@ void ext4_discard_preallocations(struct inode *inode)
>  	mb_debug(sb, "discard preallocation for inode %lu\n",
>  		 inode->i_ino);
>  	trace_ext4_discard_preallocations(inode,
> -			atomic_read(&ei->i_prealloc_active), 0);
> +			atomic_read(&ei->i_prealloc_active));
>  
>  repeat:
>  	/* first, collect all pa's in the inode */
> diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
> index 65029dfb9..a697f4b77 100644
> --- a/include/trace/events/ext4.h
> +++ b/include/trace/events/ext4.h
> @@ -772,15 +772,14 @@ TRACE_EVENT(ext4_mb_release_group_pa,
>  );
>  
>  TRACE_EVENT(ext4_discard_preallocations,
> -	TP_PROTO(struct inode *inode, unsigned int len, unsigned int needed),
> +	TP_PROTO(struct inode *inode, unsigned int len),
>  
> -	TP_ARGS(inode, len, needed),
> +	TP_ARGS(inode, len),
>  
>  	TP_STRUCT__entry(
>  		__field(	dev_t,		dev		)
>  		__field(	ino_t,		ino		)
>  		__field(	unsigned int,	len		)
> -		__field(	unsigned int,	needed		)
>  
>  	),
>  
> @@ -788,13 +787,11 @@ TRACE_EVENT(ext4_discard_preallocations,
>  		__entry->dev	= inode->i_sb->s_dev;
>  		__entry->ino	= inode->i_ino;
>  		__entry->len	= len;
> -		__entry->needed	= needed;
>  	),
>  
> -	TP_printk("dev %d,%d ino %lu len: %u needed %u",
> +	TP_printk("dev %d,%d ino %lu len: %u",
>  		  MAJOR(__entry->dev), MINOR(__entry->dev),
> -		  (unsigned long) __entry->ino, __entry->len,
> -		  __entry->needed)
> +		  (unsigned long) __entry->ino, __entry->len)
>  );
>  
>  TRACE_EVENT(ext4_mb_discard_preallocations,
> -- 
> 2.30.0
> 
-- 
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR