Commit 071688f3 authored by Li Zefan's avatar Li Zefan Committed by Ingo Molnar
Browse files

tracing: Convert some jbd2 events to DEFINE_EVENT 



Use DECLARE_EVENT_CLASS to remove duplicate code:

   text    data     bss     dec     hex filename
  34903    1693     448   37044    90b4 fs/jbd2/journal.o.old
  31931    1693     416   34040    84f8 fs/jbd2/journal.o

Four events are converted:

  jbd2_commit: jbd2_start_commit,
               jbd2_commit_{locking, flushing, logging}

No change in functionality.

Signed-off-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <4B0E290F.7030909@cn.fujitsu.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 77ca1e02

include/trace/events/jbd2.h

+11 −52
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ TRACE_EVENT(jbd2_checkpoint, 
		  jbd2_dev_to_name(__entry->dev), __entry->result)

);



TRACE_EVENT(jbd2_start_commit,

DECLARE_EVENT_CLASS(jbd2_commit,



	TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
@@ -53,73 +53,32 @@ TRACE_EVENT(jbd2_start_commit, 
		  __entry->sync_commit)

);



TRACE_EVENT(jbd2_commit_locking,

DEFINE_EVENT(jbd2_commit, jbd2_start_commit,



	TP_PROTO(journal_t *journal, transaction_t *commit_transaction),



	TP_ARGS(journal, commit_transaction),



	TP_STRUCT__entry(

		__field(	dev_t,	dev			)

		__field(	char,	sync_commit		  )

		__field(	int,	transaction		  )

	),



	TP_fast_assign(

		__entry->dev		= journal->j_fs_dev->bd_dev;

		__entry->sync_commit = commit_transaction->t_synchronous_commit;

		__entry->transaction	= commit_transaction->t_tid;

	),



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

		  jbd2_dev_to_name(__entry->dev), __entry->transaction,

		  __entry->sync_commit)

	TP_ARGS(journal, commit_transaction)

);



TRACE_EVENT(jbd2_commit_flushing,

DEFINE_EVENT(jbd2_commit, jbd2_commit_locking,



	TP_PROTO(journal_t *journal, transaction_t *commit_transaction),



	TP_ARGS(journal, commit_transaction),



	TP_STRUCT__entry(

		__field(	dev_t,	dev			)

		__field(	char,	sync_commit		  )

		__field(	int,	transaction		  )

	),



	TP_fast_assign(

		__entry->dev		= journal->j_fs_dev->bd_dev;

		__entry->sync_commit = commit_transaction->t_synchronous_commit;

		__entry->transaction	= commit_transaction->t_tid;

	),



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

		  jbd2_dev_to_name(__entry->dev), __entry->transaction,

		  __entry->sync_commit)

	TP_ARGS(journal, commit_transaction)

);



TRACE_EVENT(jbd2_commit_logging,

DEFINE_EVENT(jbd2_commit, jbd2_commit_flushing,



	TP_PROTO(journal_t *journal, transaction_t *commit_transaction),



	TP_ARGS(journal, commit_transaction),

	TP_ARGS(journal, commit_transaction)

);



	TP_STRUCT__entry(

		__field(	dev_t,	dev			)

		__field(	char,	sync_commit		  )

		__field(	int,	transaction		  )

	),

DEFINE_EVENT(jbd2_commit, jbd2_commit_logging,



	TP_fast_assign(

		__entry->dev		= journal->j_fs_dev->bd_dev;

		__entry->sync_commit = commit_transaction->t_synchronous_commit;

		__entry->transaction	= commit_transaction->t_tid;

	),

	TP_PROTO(journal_t *journal, transaction_t *commit_transaction),



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

		  jbd2_dev_to_name(__entry->dev), __entry->transaction,

		  __entry->sync_commit)

	TP_ARGS(journal, commit_transaction)

);



TRACE_EVENT(jbd2_end_commit,

CRA Git | Maintained and supported by SUSTech CRA and CCSE