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

* 'writeback-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:
  writeback: Add a 'reason' to wb_writeback_work
  writeback: send work item to queue_io, move_expired_inodes
  writeback: trace event balance_dirty_pages
  writeback: trace event bdi_dirty_ratelimit
  writeback: fix ppc compile warnings on do_div(long long, unsigned long)
  writeback: per-bdi background threshold
  writeback: dirty position control - bdi reserve area
  writeback: control dirty pause time
  writeback: limit max dirty pause time
  writeback: IO-less balance_dirty_pages()
  writeback: per task dirty rate limit
  writeback: stabilize bdi->dirty_ratelimit
  writeback: dirty rate control
  writeback: add bg_threshold parameter to __bdi_update_bandwidth()
  writeback: dirty position control
  writeback: account per-bdi accumulated dirtied pages

1 files changed, 6 insertions, 1 deletions

diff --git a/mm/backing-dev.c b/mm/backing-dev.c
index 7520ef0bfd47..a0860640378d 100644
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -97,6 +97,7 @@ static int bdi_debug_stats_show(struct seq_file *m, void *v)
                    "BdiDirtyThresh:     %10lu kB\n"
                    "DirtyThresh:        %10lu kB\n"
                    "BackgroundThresh:   %10lu kB\n"
+                   "BdiDirtied:         %10lu kB\n"
                    "BdiWritten:         %10lu kB\n"
                    "BdiWriteBandwidth:  %10lu kBps\n"
                    "b_dirty:            %10lu\n"
@@ -109,6 +110,7 @@ static int bdi_debug_stats_show(struct seq_file *m, void *v)
                    K(bdi_thresh),
                    K(dirty_thresh),
                    K(background_thresh),
+                   (unsigned long) K(bdi_stat(bdi, BDI_DIRTIED)),
                    (unsigned long) K(bdi_stat(bdi, BDI_WRITTEN)),
                    (unsigned long) K(bdi->write_bandwidth),
                    nr_dirty,
@@ -473,7 +475,8 @@ static int bdi_forker_thread(void *ptr)
                                  * the bdi from the thread. Hopefully 1024 is
                                  * large enough for efficient IO.
                                  */
-                                writeback_inodes_wb(&bdi->wb, 1024);
+                                writeback_inodes_wb(&bdi->wb, 1024,
+                                                    WB_REASON_FORKER_THREAD);
                         } else {
                                 /*
                                  * The spinlock makes sure we do not lose
@@ -683,6 +686,8 @@ int bdi_init(struct backing_dev_info *bdi)
         bdi->bw_time_stamp = jiffies;
         bdi->written_stamp = 0;
 
+        bdi->balanced_dirty_ratelimit = INIT_BW;
+        bdi->dirty_ratelimit = INIT_BW;
         bdi->write_bandwidth = INIT_BW;
         bdi->avg_write_bandwidth = INIT_BW;