Merge branch 'lazytime' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull lazytime mount option support from Al Viro:
 "Lazytime stuff from tytso"

* 'lazytime' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  ext4: add optimization for the lazytime mount option
  vfs: add find_inode_nowait() function
  vfs: add support for a lazytime mount option

1 files changed, 8 insertions, 2 deletions

diff --git a/mm/backing-dev.c b/mm/backing-dev.c
index 7690ec77c722..6dc4580df2af 100644
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -49,10 +49,10 @@ static int bdi_debug_stats_show(struct seq_file *m, void *v)
         unsigned long background_thresh;
         unsigned long dirty_thresh;
         unsigned long bdi_thresh;
-        unsigned long nr_dirty, nr_io, nr_more_io;
+        unsigned long nr_dirty, nr_io, nr_more_io, nr_dirty_time;
         struct inode *inode;
 
-        nr_dirty = nr_io = nr_more_io = 0;
+        nr_dirty = nr_io = nr_more_io = nr_dirty_time = 0;
         spin_lock(&wb->list_lock);
         list_for_each_entry(inode, &wb->b_dirty, i_wb_list)
                 nr_dirty++;
@@ -60,6 +60,9 @@ static int bdi_debug_stats_show(struct seq_file *m, void *v)
                 nr_io++;
         list_for_each_entry(inode, &wb->b_more_io, i_wb_list)
                 nr_more_io++;
+        list_for_each_entry(inode, &wb->b_dirty_time, i_wb_list)
+                if (inode->i_state & I_DIRTY_TIME)
+                        nr_dirty_time++;
         spin_unlock(&wb->list_lock);
 
         global_dirty_limits(&background_thresh, &dirty_thresh);
@@ -78,6 +81,7 @@ static int bdi_debug_stats_show(struct seq_file *m, void *v)
                    "b_dirty:            %10lu\n"
                    "b_io:               %10lu\n"
                    "b_more_io:          %10lu\n"
+                   "b_dirty_time:       %10lu\n"
                    "bdi_list:           %10u\n"
                    "state:              %10lx\n",
                    (unsigned long) K(bdi_stat(bdi, BDI_WRITEBACK)),
@@ -91,6 +95,7 @@ static int bdi_debug_stats_show(struct seq_file *m, void *v)
                    nr_dirty,
                    nr_io,
                    nr_more_io,
+                   nr_dirty_time,
                    !list_empty(&bdi->bdi_list), bdi->state);
 #undef K
 
@@ -380,6 +385,7 @@ static void bdi_wb_init(struct bdi_writeback *wb, struct backing_dev_info *bdi)
         INIT_LIST_HEAD(&wb->b_dirty);
         INIT_LIST_HEAD(&wb->b_io);
         INIT_LIST_HEAD(&wb->b_more_io);
+        INIT_LIST_HEAD(&wb->b_dirty_time);
         spin_lock_init(&wb->list_lock);
         INIT_DELAYED_WORK(&wb->dwork, bdi_writeback_workfn);
 }