Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / include / trace / events / jbd2.h

diff --git a/include/trace/events/jbd2.h b/include/trace/events/jbd2.h
index e05a362bf3f14f7fb3d9bde4ebd9f929122dd27a..127993dbf322efa40bc68222551ff181132122b4 100644 (file)
--- a/include/trace/events/jbd2.h
+++ b/include/trace/events/jbd2.h
@@ -207,7 +207,7 @@ TRACE_EVENT(jbd2_checkpoint_stats,
                  __entry->forced_to_close, __entry->written, __entry->dropped)
 );
 
-TRACE_EVENT(jbd2_cleanup_journal_tail,
+TRACE_EVENT(jbd2_update_log_tail,
 
        TP_PROTO(journal_t *journal, tid_t first_tid,
                 unsigned long block_nr, unsigned long freed),
@@ -238,19 +238,22 @@ TRACE_EVENT(jbd2_cleanup_journal_tail,
 
 TRACE_EVENT(jbd2_write_superblock,
 
-       TP_PROTO(journal_t *journal),
+       TP_PROTO(journal_t *journal, int write_op),
 
-       TP_ARGS(journal),
+       TP_ARGS(journal, write_op),
 
        TP_STRUCT__entry(
                __field(        dev_t,  dev                     )
+               __field(          int,  write_op                )
        ),
 
        TP_fast_assign(
                __entry->dev            = journal->j_fs_dev->bd_dev;
+               __entry->write_op       = write_op;
        ),
 
-       TP_printk("dev %d,%d", MAJOR(__entry->dev), MINOR(__entry->dev))
+       TP_printk("dev %d,%d write_op %x", MAJOR(__entry->dev),
+                 MINOR(__entry->dev), __entry->write_op)
 );
 
 #endif /* _TRACE_JBD2_H */