Commit f0e54b60 authored by Kemeng Shi's avatar Kemeng Shi Committed by Theodore Ts'o
Browse files

ext4: remove 'needed' in trace_ext4_discard_preallocations 



As 'needed' to trace_ext4_discard_preallocations is always 0 which
is meaningless. Just remove it.

Signed-off-by: default avatarKemeng Shi <shikemeng@huaweicloud.com>
Suggested-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20240105092102.496631-10-shikemeng@huaweicloud.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 2ffd2a6a

fs/ext4/mballoc.c

+2 −3
Original line number Diff line number Diff line
@@ -5510,9 +5510,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;
@@ -5520,7 +5519,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 */

include/trace/events/ext4.h

+4 −7
Original line number Diff line number Diff line
@@ -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,