1 files changed, 35 insertions, 2 deletions

diff --git a/include/trace/events/writeback.h b/include/trace/events/writeback.h
index f345f66ae9d1..89a2b2db4375 100644
--- a/include/trace/events/writeback.h
+++ b/include/trace/events/writeback.h
@@ -96,8 +96,6 @@ DECLARE_EVENT_CLASS(wbc_class,
                 __field(long, nr_to_write)
                 __field(long, pages_skipped)
                 __field(int, sync_mode)
-                __field(int, nonblocking)
-                __field(int, encountered_congestion)
                 __field(int, for_kupdate)
                 __field(int, for_background)
                 __field(int, for_reclaim)
@@ -153,6 +151,41 @@ DEFINE_WBC_EVENT(wbc_balance_dirty_written);
 DEFINE_WBC_EVENT(wbc_balance_dirty_wait);
 DEFINE_WBC_EVENT(wbc_writepage);
 
+DECLARE_EVENT_CLASS(writeback_congest_waited_template,
+
+        TP_PROTO(unsigned int usec_timeout, unsigned int usec_delayed),
+
+        TP_ARGS(usec_timeout, usec_delayed),
+
+        TP_STRUCT__entry(
+                __field(        unsigned int,   usec_timeout    )
+                __field(        unsigned int,   usec_delayed    )
+        ),
+
+        TP_fast_assign(
+                __entry->usec_timeout   = usec_timeout;
+                __entry->usec_delayed   = usec_delayed;
+        ),
+
+        TP_printk("usec_timeout=%u usec_delayed=%u",
+                        __entry->usec_timeout,
+                        __entry->usec_delayed)
+);
+
+DEFINE_EVENT(writeback_congest_waited_template, writeback_congestion_wait,
+
+        TP_PROTO(unsigned int usec_timeout, unsigned int usec_delayed),
+
+        TP_ARGS(usec_timeout, usec_delayed)
+);
+
+DEFINE_EVENT(writeback_congest_waited_template, writeback_wait_iff_congested,
+
+        TP_PROTO(unsigned int usec_timeout, unsigned int usec_delayed),
+
+        TP_ARGS(usec_timeout, usec_delayed)
+);
+
 #endif /* _TRACE_WRITEBACK_H */
 
 /* This part must be outside protection */