Commit 61801325 authored by Lukas Czerner's avatar Lukas Czerner Committed by Theodore Ts'o

ext4: update ext4_ext_remove_space trace point

Add "end" variable.
Signed-off-by: default avatarLukas Czerner <lczerner@redhat.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 78fb9cdf
...@@ -2663,7 +2663,7 @@ int ext4_ext_remove_space(struct inode *inode, ext4_lblk_t start, ...@@ -2663,7 +2663,7 @@ int ext4_ext_remove_space(struct inode *inode, ext4_lblk_t start,
return PTR_ERR(handle); return PTR_ERR(handle);
again: again:
trace_ext4_ext_remove_space(inode, start, depth); trace_ext4_ext_remove_space(inode, start, end, depth);
/* /*
* Check if we are removing extents inside the extent tree. If that * Check if we are removing extents inside the extent tree. If that
...@@ -2831,8 +2831,8 @@ int ext4_ext_remove_space(struct inode *inode, ext4_lblk_t start, ...@@ -2831,8 +2831,8 @@ int ext4_ext_remove_space(struct inode *inode, ext4_lblk_t start,
} }
} }
trace_ext4_ext_remove_space_done(inode, start, depth, partial_cluster, trace_ext4_ext_remove_space_done(inode, start, end, depth,
path->p_hdr->eh_entries); partial_cluster, path->p_hdr->eh_entries);
/* If we still have something in the partial cluster and we have removed /* If we still have something in the partial cluster and we have removed
* even the first extent, then we should free the blocks in the partial * even the first extent, then we should free the blocks in the partial
......
...@@ -2027,14 +2027,16 @@ TRACE_EVENT(ext4_ext_rm_idx, ...@@ -2027,14 +2027,16 @@ TRACE_EVENT(ext4_ext_rm_idx,
); );
TRACE_EVENT(ext4_ext_remove_space, TRACE_EVENT(ext4_ext_remove_space,
TP_PROTO(struct inode *inode, ext4_lblk_t start, int depth), TP_PROTO(struct inode *inode, ext4_lblk_t start,
ext4_lblk_t end, int depth),
TP_ARGS(inode, start, depth), TP_ARGS(inode, start, end, depth),
TP_STRUCT__entry( TP_STRUCT__entry(
__field( dev_t, dev ) __field( dev_t, dev )
__field( ino_t, ino ) __field( ino_t, ino )
__field( ext4_lblk_t, start ) __field( ext4_lblk_t, start )
__field( ext4_lblk_t, end )
__field( int, depth ) __field( int, depth )
), ),
...@@ -2042,26 +2044,29 @@ TRACE_EVENT(ext4_ext_remove_space, ...@@ -2042,26 +2044,29 @@ TRACE_EVENT(ext4_ext_remove_space,
__entry->dev = inode->i_sb->s_dev; __entry->dev = inode->i_sb->s_dev;
__entry->ino = inode->i_ino; __entry->ino = inode->i_ino;
__entry->start = start; __entry->start = start;
__entry->end = end;
__entry->depth = depth; __entry->depth = depth;
), ),
TP_printk("dev %d,%d ino %lu since %u depth %d", TP_printk("dev %d,%d ino %lu since %u end %u depth %d",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long) __entry->ino, (unsigned long) __entry->ino,
(unsigned) __entry->start, (unsigned) __entry->start,
(unsigned) __entry->end,
__entry->depth) __entry->depth)
); );
TRACE_EVENT(ext4_ext_remove_space_done, TRACE_EVENT(ext4_ext_remove_space_done,
TP_PROTO(struct inode *inode, ext4_lblk_t start, int depth, TP_PROTO(struct inode *inode, ext4_lblk_t start, ext4_lblk_t end,
ext4_lblk_t partial, __le16 eh_entries), int depth, ext4_lblk_t partial, __le16 eh_entries),
TP_ARGS(inode, start, depth, partial, eh_entries), TP_ARGS(inode, start, end, depth, partial, eh_entries),
TP_STRUCT__entry( TP_STRUCT__entry(
__field( dev_t, dev ) __field( dev_t, dev )
__field( ino_t, ino ) __field( ino_t, ino )
__field( ext4_lblk_t, start ) __field( ext4_lblk_t, start )
__field( ext4_lblk_t, end )
__field( int, depth ) __field( int, depth )
__field( ext4_lblk_t, partial ) __field( ext4_lblk_t, partial )
__field( unsigned short, eh_entries ) __field( unsigned short, eh_entries )
...@@ -2071,16 +2076,18 @@ TRACE_EVENT(ext4_ext_remove_space_done, ...@@ -2071,16 +2076,18 @@ TRACE_EVENT(ext4_ext_remove_space_done,
__entry->dev = inode->i_sb->s_dev; __entry->dev = inode->i_sb->s_dev;
__entry->ino = inode->i_ino; __entry->ino = inode->i_ino;
__entry->start = start; __entry->start = start;
__entry->end = end;
__entry->depth = depth; __entry->depth = depth;
__entry->partial = partial; __entry->partial = partial;
__entry->eh_entries = le16_to_cpu(eh_entries); __entry->eh_entries = le16_to_cpu(eh_entries);
), ),
TP_printk("dev %d,%d ino %lu since %u depth %d partial %u " TP_printk("dev %d,%d ino %lu since %u end %u depth %d partial %u "
"remaining_entries %u", "remaining_entries %u",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long) __entry->ino, (unsigned long) __entry->ino,
(unsigned) __entry->start, (unsigned) __entry->start,
(unsigned) __entry->end,
__entry->depth, __entry->depth,
(unsigned) __entry->partial, (unsigned) __entry->partial,
(unsigned short) __entry->eh_entries) (unsigned short) __entry->eh_entries)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment