Skip to content

Commit

Permalink
ext4: update ext4_ext_remove_space trace point
Browse files Browse the repository at this point in the history
Add "end" variable.

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  • Loading branch information
Lukas Czerner authored and Theodore Ts'o committed May 28, 2013
1 parent 78fb9cd commit 6180132
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 10 deletions.
6 changes: 3 additions & 3 deletions fs/ext4/extents.c
Original file line number Diff line number Diff line change
Expand Up @@ -2663,7 +2663,7 @@ int ext4_ext_remove_space(struct inode *inode, ext4_lblk_t start,
return PTR_ERR(handle);

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
Expand Down Expand Up @@ -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,
path->p_hdr->eh_entries);
trace_ext4_ext_remove_space_done(inode, start, end, depth,
partial_cluster, path->p_hdr->eh_entries);

/* 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
Expand Down
21 changes: 14 additions & 7 deletions include/trace/events/ext4.h
Original file line number Diff line number Diff line change
Expand Up @@ -2027,41 +2027,46 @@ TRACE_EVENT(ext4_ext_rm_idx,
);

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(
__field( dev_t, dev )
__field( ino_t, ino )
__field( ext4_lblk_t, start )
__field( ext4_lblk_t, end )
__field( int, depth )
),

TP_fast_assign(
__entry->dev = inode->i_sb->s_dev;
__entry->ino = inode->i_ino;
__entry->start = start;
__entry->end = end;
__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),
(unsigned long) __entry->ino,
(unsigned) __entry->start,
(unsigned) __entry->end,
__entry->depth)
);

TRACE_EVENT(ext4_ext_remove_space_done,
TP_PROTO(struct inode *inode, ext4_lblk_t start, int depth,
ext4_lblk_t partial, __le16 eh_entries),
TP_PROTO(struct inode *inode, ext4_lblk_t start, ext4_lblk_t end,
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(
__field( dev_t, dev )
__field( ino_t, ino )
__field( ext4_lblk_t, start )
__field( ext4_lblk_t, end )
__field( int, depth )
__field( ext4_lblk_t, partial )
__field( unsigned short, eh_entries )
Expand All @@ -2071,16 +2076,18 @@ TRACE_EVENT(ext4_ext_remove_space_done,
__entry->dev = inode->i_sb->s_dev;
__entry->ino = inode->i_ino;
__entry->start = start;
__entry->end = end;
__entry->depth = depth;
__entry->partial = partial;
__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",
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long) __entry->ino,
(unsigned) __entry->start,
(unsigned) __entry->end,
__entry->depth,
(unsigned) __entry->partial,
(unsigned short) __entry->eh_entries)
Expand Down

0 comments on commit 6180132

Please sign in to comment.