Skip to content

Commit f0e54b6

Browse files
Kemeng Shitytso
authored andcommitted
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: Kemeng Shi <shikemeng@huaweicloud.com> Suggested-by: Jan Kara <jack@suse.cz> Reviewed-by: Jan Kara <jack@suse.cz> Link: https://lore.kernel.org/r/20240105092102.496631-10-shikemeng@huaweicloud.com Signed-off-by: Theodore Ts'o <tytso@mit.edu>
1 parent 2ffd2a6 commit f0e54b6

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

fs/ext4/mballoc.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5510,17 +5510,16 @@ void ext4_discard_preallocations(struct inode *inode)
55105510
struct rb_node *iter;
55115511
int err;
55125512

5513-
if (!S_ISREG(inode->i_mode)) {
5513+
if (!S_ISREG(inode->i_mode))
55145514
return;
5515-
}
55165515

55175516
if (EXT4_SB(sb)->s_mount_state & EXT4_FC_REPLAY)
55185517
return;
55195518

55205519
mb_debug(sb, "discard preallocation for inode %lu\n",
55215520
inode->i_ino);
55225521
trace_ext4_discard_preallocations(inode,
5523-
atomic_read(&ei->i_prealloc_active), 0);
5522+
atomic_read(&ei->i_prealloc_active));
55245523

55255524
repeat:
55265525
/* first, collect all pa's in the inode */

include/trace/events/ext4.h

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -772,29 +772,26 @@ TRACE_EVENT(ext4_mb_release_group_pa,
772772
);
773773

774774
TRACE_EVENT(ext4_discard_preallocations,
775-
TP_PROTO(struct inode *inode, unsigned int len, unsigned int needed),
775+
TP_PROTO(struct inode *inode, unsigned int len),
776776

777-
TP_ARGS(inode, len, needed),
777+
TP_ARGS(inode, len),
778778

779779
TP_STRUCT__entry(
780780
__field( dev_t, dev )
781781
__field( ino_t, ino )
782782
__field( unsigned int, len )
783-
__field( unsigned int, needed )
784783

785784
),
786785

787786
TP_fast_assign(
788787
__entry->dev = inode->i_sb->s_dev;
789788
__entry->ino = inode->i_ino;
790789
__entry->len = len;
791-
__entry->needed = needed;
792790
),
793791

794-
TP_printk("dev %d,%d ino %lu len: %u needed %u",
792+
TP_printk("dev %d,%d ino %lu len: %u",
795793
MAJOR(__entry->dev), MINOR(__entry->dev),
796-
(unsigned long) __entry->ino, __entry->len,
797-
__entry->needed)
794+
(unsigned long) __entry->ino, __entry->len)
798795
);
799796

800797
TRACE_EVENT(ext4_mb_discard_preallocations,

0 commit comments

Comments
 (0)