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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/writeback: (27 commits)
  mm: properly reflect task dirty limits in dirty_exceeded logic
  writeback: don't busy retry writeback on new/freeing inodes
  writeback: scale IO chunk size up to half device bandwidth
  writeback: trace global_dirty_state
  writeback: introduce max-pause and pass-good dirty limits
  writeback: introduce smoothed global dirty limit
  writeback: consolidate variable names in balance_dirty_pages()
  writeback: show bdi write bandwidth in debugfs
  writeback: bdi write bandwidth estimation
  writeback: account per-bdi accumulated written pages
  writeback: make writeback_control.nr_to_write straight
  writeback: skip tmpfs early in balance_dirty_pages_ratelimited_nr()
  writeback: trace event writeback_queue_io
  writeback: trace event writeback_single_inode
  writeback: remove .nonblocking and .encountered_congestion
  writeback: remove writeback_control.more_io
  writeback: skip balance_dirty_pages() for in-memory fs
  writeback: add bdi_dirty_limit() kernel-doc
  writeback: avoid extra sync work at enqueue time
  writeback: elevate queue_io() into wb_writeback()
  ...

Fix up trivial conflicts in fs/fs-writeback.c and mm/filemap.c

1 files changed, 2 insertions, 4 deletions

diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index 5ce2b2f5f524..6363193a3418 100644
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -380,7 +380,6 @@ TRACE_EVENT(ext4_da_writepages_result,
                 __field(        int,    pages_written           )
                 __field(        long,   pages_skipped           )
                 __field(        int,    sync_mode               )
-                __field(        char,   more_io                 )       
                 __field(       pgoff_t, writeback_index         )
         ),
 
@@ -391,16 +390,15 @@ TRACE_EVENT(ext4_da_writepages_result,
                 __entry->pages_written  = pages_written;
                 __entry->pages_skipped  = wbc->pages_skipped;
                 __entry->sync_mode      = wbc->sync_mode;
-                __entry->more_io        = wbc->more_io;
                 __entry->writeback_index = inode->i_mapping->writeback_index;
         ),
 
         TP_printk("dev %d,%d ino %lu ret %d pages_written %d pages_skipped %ld "
-                  " more_io %d sync_mode %d writeback_index %lu",
+                  "sync_mode %d writeback_index %lu",
                   MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long) __entry->ino, __entry->ret,
                   __entry->pages_written, __entry->pages_skipped,
-                  __entry->more_io, __entry->sync_mode,
+                  __entry->sync_mode,
                   (unsigned long) __entry->writeback_index)
 );