Part of the gradual TRACE_EVENT() semicolon removal. Enables creation of array of events, thus saving space for trace event probes. Signed-off-by: Mathieu Desnoyers CC: Steven Rostedt CC: Frederic Weisbecker CC: Ingo Molnar CC: Thomas Gleixner CC: Li Zefan CC: Theodore Ts'o --- include/trace/events/jbd2.h | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) Index: linux-2.6-lttng/include/trace/events/jbd2.h =================================================================== --- linux-2.6-lttng.orig/include/trace/events/jbd2.h +++ linux-2.6-lttng/include/trace/events/jbd2.h @@ -7,9 +7,14 @@ #include #include +#ifndef _TRACE_JBD2_DEF_ +#define _TRACE_JBD2_DEF_ + struct transaction_chp_stats_s; struct transaction_run_stats_s; +#endif /* _TRACE_JBD2_DEF_ */ + TRACE_EVENT(jbd2_checkpoint, TP_PROTO(journal_t *journal, int result), @@ -30,7 +35,7 @@ TRACE_EVENT(jbd2_checkpoint, TP_printk("dev %d,%d result %d", __entry->dev_major, __entry->dev_minor, __entry->result) -); +) DECLARE_EVENT_CLASS(jbd2_commit, @@ -55,35 +60,35 @@ DECLARE_EVENT_CLASS(jbd2_commit, TP_printk("dev %d,%d transaction %d sync %d", __entry->dev_major, __entry->dev_minor, __entry->transaction, __entry->sync_commit) -); +) DEFINE_EVENT(jbd2_commit, jbd2_start_commit, TP_PROTO(journal_t *journal, transaction_t *commit_transaction), TP_ARGS(journal, commit_transaction) -); +) DEFINE_EVENT(jbd2_commit, jbd2_commit_locking, TP_PROTO(journal_t *journal, transaction_t *commit_transaction), TP_ARGS(journal, commit_transaction) -); +) DEFINE_EVENT(jbd2_commit, jbd2_commit_flushing, TP_PROTO(journal_t *journal, transaction_t *commit_transaction), TP_ARGS(journal, commit_transaction) -); +) DEFINE_EVENT(jbd2_commit, jbd2_commit_logging, TP_PROTO(journal_t *journal, transaction_t *commit_transaction), TP_ARGS(journal, commit_transaction) -); +) TRACE_EVENT(jbd2_end_commit, TP_PROTO(journal_t *journal, transaction_t *commit_transaction), @@ -109,7 +114,7 @@ TRACE_EVENT(jbd2_end_commit, TP_printk("dev %d,%d transaction %d sync %d head %d", __entry->dev_major, __entry->dev_minor, __entry->transaction, __entry->sync_commit, __entry->head) -); +) TRACE_EVENT(jbd2_submit_inode_data, TP_PROTO(struct inode *inode), @@ -131,7 +136,7 @@ TRACE_EVENT(jbd2_submit_inode_data, TP_printk("dev %d,%d ino %lu", __entry->dev_major, __entry->dev_minor, (unsigned long) __entry->ino) -); +) TRACE_EVENT(jbd2_run_stats, TP_PROTO(dev_t dev, unsigned long tid, @@ -177,7 +182,7 @@ TRACE_EVENT(jbd2_run_stats, jiffies_to_msecs(__entry->logging), __entry->handle_count, __entry->blocks, __entry->blocks_logged) -); +) TRACE_EVENT(jbd2_checkpoint_stats, TP_PROTO(dev_t dev, unsigned long tid, @@ -210,7 +215,7 @@ TRACE_EVENT(jbd2_checkpoint_stats, __entry->dev_major, __entry->dev_minor, __entry->tid, jiffies_to_msecs(__entry->chp_time), __entry->forced_to_close, __entry->written, __entry->dropped) -); +) TRACE_EVENT(jbd2_cleanup_journal_tail, @@ -241,7 +246,7 @@ TRACE_EVENT(jbd2_cleanup_journal_tail, __entry->dev_major, __entry->dev_minor, __entry->tail_sequence, __entry->first_tid, __entry->block_nr, __entry->freed) -); +) #endif /* _TRACE_JBD2_H */ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/