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

Commit ecb9d0d2 authored by Bixuan Cui's avatar Bixuan Cui Committed by Greg Kroah-Hartman
Browse files

jbd2: use the correct print format 



[ Upstream commit d87a7b4c77a997d5388566dd511ca8e6b8e8a0a8 ]

The print format error was found when using ftrace event:
    <...>-1406 [000] .... 23599442.895823: jbd2_end_commit: dev 252,8 transaction -1866216965 sync 0 head -1866217368
    <...>-1406 [000] .... 23599442.896299: jbd2_start_commit: dev 252,8 transaction -1866216964 sync 0

Use the correct print format for transaction, head and tid.

Fixes: 879c5e6b ('jbd2: convert instrumentation from markers to tracepoints')
Signed-off-by: default avatarBixuan Cui <cuibixuan@linux.alibaba.com>
Reviewed-by: default avatarJason Yan <yanaijie@huawei.com>
Link: https://lore.kernel.org/r/1665488024-95172-1-git-send-email-cuibixuan@linux.alibaba.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 06bb3f4e

include/trace/events/jbd2.h

+20 −20
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ DECLARE_EVENT_CLASS(jbd2_commit, 
	TP_STRUCT__entry(

		__field(	dev_t,	dev			)

		__field(	char,	sync_commit		  )

		__field(	int,	transaction		  )

		__field(	tid_t,	transaction		  )

	),



	TP_fast_assign(
@@ -49,7 +49,7 @@ DECLARE_EVENT_CLASS(jbd2_commit, 
		__entry->transaction	= commit_transaction->t_tid;

	),



	TP_printk("dev %d,%d transaction %d sync %d",

	TP_printk("dev %d,%d transaction %u sync %d",

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

		  __entry->transaction, __entry->sync_commit)

);
@@ -97,8 +97,8 @@ TRACE_EVENT(jbd2_end_commit, 
	TP_STRUCT__entry(

		__field(	dev_t,	dev			)

		__field(	char,	sync_commit		  )

		__field(	int,	transaction		  )

		__field(	int,	head		  	  )

		__field(	tid_t,	transaction		  )

		__field(	tid_t,	head		  	  )

	),



	TP_fast_assign(
@@ -108,7 +108,7 @@ TRACE_EVENT(jbd2_end_commit, 
		__entry->head		= journal->j_tail_sequence;

	),



	TP_printk("dev %d,%d transaction %d sync %d head %d",

	TP_printk("dev %d,%d transaction %u sync %d head %u",

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

		  __entry->transaction, __entry->sync_commit, __entry->head)

);
@@ -134,14 +134,14 @@ TRACE_EVENT(jbd2_submit_inode_data, 
);



TRACE_EVENT(jbd2_handle_start,

	TP_PROTO(dev_t dev, unsigned long tid, unsigned int type,

	TP_PROTO(dev_t dev, tid_t tid, unsigned int type,

		 unsigned int line_no, int requested_blocks),



	TP_ARGS(dev, tid, type, line_no, requested_blocks),



	TP_STRUCT__entry(

		__field(		dev_t,	dev		)

		__field(	unsigned long,	tid		)

		__field(		tid_t,	tid		)

		__field(	 unsigned int,	type		)

		__field(	 unsigned int,	line_no		)

		__field(		  int,	requested_blocks)
@@ -155,14 +155,14 @@ TRACE_EVENT(jbd2_handle_start, 
		__entry->requested_blocks = requested_blocks;

	),



	TP_printk("dev %d,%d tid %lu type %u line_no %u "

	TP_printk("dev %d,%d tid %u type %u line_no %u "

		  "requested_blocks %d",

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

		  __entry->type, __entry->line_no, __entry->requested_blocks)

);



TRACE_EVENT(jbd2_handle_extend,

	TP_PROTO(dev_t dev, unsigned long tid, unsigned int type,

	TP_PROTO(dev_t dev, tid_t tid, unsigned int type,

		 unsigned int line_no, int buffer_credits,

		 int requested_blocks),
@@ -170,7 +170,7 @@ TRACE_EVENT(jbd2_handle_extend, 


	TP_STRUCT__entry(

		__field(		dev_t,	dev		)

		__field(	unsigned long,	tid		)

		__field(		tid_t,	tid		)

		__field(	 unsigned int,	type		)

		__field(	 unsigned int,	line_no		)

		__field(		  int,	buffer_credits  )
@@ -186,7 +186,7 @@ TRACE_EVENT(jbd2_handle_extend, 
		__entry->requested_blocks = requested_blocks;

	),



	TP_printk("dev %d,%d tid %lu type %u line_no %u "

	TP_printk("dev %d,%d tid %u type %u line_no %u "

		  "buffer_credits %d requested_blocks %d",

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

		  __entry->type, __entry->line_no, __entry->buffer_credits,
@@ -194,7 +194,7 @@ TRACE_EVENT(jbd2_handle_extend, 
);



TRACE_EVENT(jbd2_handle_stats,

	TP_PROTO(dev_t dev, unsigned long tid, unsigned int type,

	TP_PROTO(dev_t dev, tid_t tid, unsigned int type,

		 unsigned int line_no, int interval, int sync,

		 int requested_blocks, int dirtied_blocks),
@@ -203,7 +203,7 @@ TRACE_EVENT(jbd2_handle_stats, 


	TP_STRUCT__entry(

		__field(		dev_t,	dev		)

		__field(	unsigned long,	tid		)

		__field(		tid_t,	tid		)

		__field(	 unsigned int,	type		)

		__field(	 unsigned int,	line_no		)

		__field(		  int,	interval	)
@@ -223,7 +223,7 @@ TRACE_EVENT(jbd2_handle_stats, 
		__entry->dirtied_blocks	  = dirtied_blocks;

	),



	TP_printk("dev %d,%d tid %lu type %u line_no %u interval %d "

	TP_printk("dev %d,%d tid %u type %u line_no %u interval %d "

		  "sync %d requested_blocks %d dirtied_blocks %d",

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

		  __entry->type, __entry->line_no, __entry->interval,
@@ -232,14 +232,14 @@ TRACE_EVENT(jbd2_handle_stats, 
);



TRACE_EVENT(jbd2_run_stats,

	TP_PROTO(dev_t dev, unsigned long tid,

	TP_PROTO(dev_t dev, tid_t tid,

		 struct transaction_run_stats_s *stats),



	TP_ARGS(dev, tid, stats),



	TP_STRUCT__entry(

		__field(		dev_t,	dev		)

		__field(	unsigned long,	tid		)

		__field(		tid_t,	tid		)

		__field(	unsigned long,	wait		)

		__field(	unsigned long,	request_delay	)

		__field(	unsigned long,	running		)
@@ -265,7 +265,7 @@ TRACE_EVENT(jbd2_run_stats, 
		__entry->blocks_logged	= stats->rs_blocks_logged;

	),



	TP_printk("dev %d,%d tid %lu wait %u request_delay %u running %u "

	TP_printk("dev %d,%d tid %u wait %u request_delay %u running %u "

		  "locked %u flushing %u logging %u handle_count %u "

		  "blocks %u blocks_logged %u",

		  MAJOR(__entry->dev), MINOR(__entry->dev), __entry->tid,
@@ -280,14 +280,14 @@ TRACE_EVENT(jbd2_run_stats, 
);



TRACE_EVENT(jbd2_checkpoint_stats,

	TP_PROTO(dev_t dev, unsigned long tid,

	TP_PROTO(dev_t dev, tid_t tid,

		 struct transaction_chp_stats_s *stats),



	TP_ARGS(dev, tid, stats),



	TP_STRUCT__entry(

		__field(		dev_t,	dev		)

		__field(	unsigned long,	tid		)

		__field(		tid_t,	tid		)

		__field(	unsigned long,	chp_time	)

		__field(		__u32,	forced_to_close	)

		__field(		__u32,	written		)
@@ -303,7 +303,7 @@ TRACE_EVENT(jbd2_checkpoint_stats, 
		__entry->dropped	= stats->cs_dropped;

	),



	TP_printk("dev %d,%d tid %lu chp_time %u forced_to_close %u "

	TP_printk("dev %d,%d tid %u chp_time %u forced_to_close %u "

		  "written %u dropped %u",

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

		  jiffies_to_msecs(__entry->chp_time),