Skip to content

Commit

Permalink
ext4: print 'flags' in ext4_ext_handle_uninitialized_extents
Browse files Browse the repository at this point in the history
In trace_ext4_ext_handle_uninitialized_extents we don't care about the
value of map->m_flags because this value is probably 0, and we prefer
to get the value of flags because we can know how to handle this
extent in this function.

Reviewed-by: Lukas Czerner <lczerner@redhat.com>
Signed-off-by: Zheng Liu <wenqing.lz@taobao.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
  • Loading branch information
Zheng Liu authored and Theodore Ts'o committed Nov 8, 2012
1 parent d71c1ae commit b564553
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions fs/ext4/extents.c
Original file line number Diff line number Diff line change
Expand Up @@ -3663,8 +3663,8 @@ ext4_ext_handle_uninitialized_extents(handle_t *handle, struct inode *inode,
flags, allocated);
ext4_ext_show_leaf(inode, path);

trace_ext4_ext_handle_uninitialized_extents(inode, map, allocated,
newblock);
trace_ext4_ext_handle_uninitialized_extents(inode, map, flags,
allocated, newblock);

/* get_block() before submit the IO, split the extent */
if ((flags & EXT4_GET_BLOCKS_PRE_IO)) {
Expand Down
8 changes: 4 additions & 4 deletions include/trace/events/ext4.h
Original file line number Diff line number Diff line change
Expand Up @@ -1680,10 +1680,10 @@ DEFINE_EVENT(ext4__trim, ext4_trim_all_free,
);

TRACE_EVENT(ext4_ext_handle_uninitialized_extents,
TP_PROTO(struct inode *inode, struct ext4_map_blocks *map,
TP_PROTO(struct inode *inode, struct ext4_map_blocks *map, int flags,
unsigned int allocated, ext4_fsblk_t newblock),

TP_ARGS(inode, map, allocated, newblock),
TP_ARGS(inode, map, flags, allocated, newblock),

TP_STRUCT__entry(
__field( dev_t, dev )
Expand All @@ -1699,15 +1699,15 @@ TRACE_EVENT(ext4_ext_handle_uninitialized_extents,
TP_fast_assign(
__entry->dev = inode->i_sb->s_dev;
__entry->ino = inode->i_ino;
__entry->flags = map->m_flags;
__entry->flags = flags;
__entry->lblk = map->m_lblk;
__entry->pblk = map->m_pblk;
__entry->len = map->m_len;
__entry->allocated = allocated;
__entry->newblk = newblock;
),

TP_printk("dev %d,%d ino %lu m_lblk %u m_pblk %llu m_len %u flags %d"
TP_printk("dev %d,%d ino %lu m_lblk %u m_pblk %llu m_len %u flags %x "
"allocated %d newblock %llu",
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long) __entry->ino,
Expand Down

0 comments on commit b564553

Please sign in to comment.