Merge branch 'master' into for-next

Conflicts:
	fs/exofs/inode.c

1 files changed, 5 insertions, 0 deletions

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index df8202ebc7b8..0c6258bd1ba3 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -34,6 +34,7 @@
 #include <linux/syscalls.h>
 #include <linux/buffer_head.h>
 #include <linux/pagevec.h>
+#include <trace/events/writeback.h>
 
 /*
  * After a CPU has dirtied this many pages, balance_dirty_pages_ratelimited
@@ -535,11 +536,13 @@ static void balance_dirty_pages(struct address_space *mapping,
                  * threshold otherwise wait until the disk writes catch
                  * up.
                  */
+                trace_wbc_balance_dirty_start(&wbc, bdi);
                 if (bdi_nr_reclaimable > bdi_thresh) {
                         writeback_inodes_wb(&bdi->wb, &wbc);
                         pages_written += write_chunk - wbc.nr_to_write;
                         get_dirty_limits(&background_thresh, &dirty_thresh,
                                        &bdi_thresh, bdi);
+                        trace_wbc_balance_dirty_written(&wbc, bdi);
                 }
 
                 /*
@@ -565,6 +568,7 @@ static void balance_dirty_pages(struct address_space *mapping,
                 if (pages_written >= write_chunk)
                         break;          /* We've done our duty */
 
+                trace_wbc_balance_dirty_wait(&wbc, bdi);
                 __set_current_state(TASK_INTERRUPTIBLE);
                 io_schedule_timeout(pause);
 
@@ -962,6 +966,7 @@ continue_unlock:
                         if (!clear_page_dirty_for_io(page))
                                 goto continue_unlock;
 
+                        trace_wbc_writepage(wbc, mapping->backing_dev_info);
                         ret = (*writepage)(page, wbc, data);
                         if (unlikely(ret)) {
                                 if (ret == AOP_WRITEPAGE_ACTIVATE) {