Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5645534 authored by Zheng Liu's avatar Zheng Liu Committed by Theodore Ts'o
Browse files

ext4: print 'flags' in ext4_ext_handle_uninitialized_extents 



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: default avatarLukas Czerner <lczerner@redhat.com>
Signed-off-by: default avatarZheng Liu <wenqing.lz@taobao.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent d71c1ae2

fs/ext4/extents.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -3663,8 +3663,8 @@ ext4_ext_handle_uninitialized_extents(handle_t *handle, struct inode *inode, 
		  flags, allocated);

		  flags, allocated);

	ext4_ext_show_leaf(inode, path);

	ext4_ext_show_leaf(inode, path);





	trace_ext4_ext_handle_uninitialized_extents(inode, map, allocated,

	trace_ext4_ext_handle_uninitialized_extents(inode, map, flags,

						    newblock);

						    allocated, newblock);





	/* get_block() before submit the IO, split the extent */

	/* get_block() before submit the IO, split the extent */

	if ((flags & EXT4_GET_BLOCKS_PRE_IO)) {

	if ((flags & EXT4_GET_BLOCKS_PRE_IO)) {

include/trace/events/ext4.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -1680,10 +1680,10 @@ DEFINE_EVENT(ext4__trim, ext4_trim_all_free, 
);

);





TRACE_EVENT(ext4_ext_handle_uninitialized_extents,

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),

		 unsigned int allocated, ext4_fsblk_t newblock),





	TP_ARGS(inode, map, allocated, newblock),

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





	TP_STRUCT__entry(

	TP_STRUCT__entry(

		__field(	dev_t,		dev		)

		__field(	dev_t,		dev		)
@@ -1699,7 +1699,7 @@ TRACE_EVENT(ext4_ext_handle_uninitialized_extents, 
	TP_fast_assign(

	TP_fast_assign(

		__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->flags		= map->m_flags;

		__entry->flags		= flags;

		__entry->lblk		= map->m_lblk;

		__entry->lblk		= map->m_lblk;

		__entry->pblk		= map->m_pblk;

		__entry->pblk		= map->m_pblk;

		__entry->len		= map->m_len;

		__entry->len		= map->m_len;
@@ -1707,7 +1707,7 @@ TRACE_EVENT(ext4_ext_handle_uninitialized_extents, 
		__entry->newblk		= newblock;

		__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",

		  "allocated %d newblock %llu",

		  MAJOR(__entry->dev), MINOR(__entry->dev),

		  MAJOR(__entry->dev), MINOR(__entry->dev),

		  (unsigned long) __entry->ino,

		  (unsigned long) __entry->ino,