3 files changed, 4 insertions, 0 deletions

diff --git a/include/linux/backing-dev-defs.h b/include/linux/backing-dev-defs.h
index c357f27d5483..dc5f76d7f648 100644
--- a/include/linux/backing-dev-defs.h
+++ b/include/linux/backing-dev-defs.h
@@ -116,6 +116,8 @@ struct bdi_writeback {
         struct list_head work_list;
         struct delayed_work dwork;      /* work item used for writeback */
 
+        unsigned long dirty_sleep;      /* last wait */
+
         struct list_head bdi_node;      /* anchored at bdi->wb_list */
 
 #ifdef CONFIG_CGROUP_WRITEBACK
diff --git a/mm/backing-dev.c b/mm/backing-dev.c
index 8fde443f36d7..3bfed5ab2475 100644
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -310,6 +310,7 @@ static int wb_init(struct bdi_writeback *wb, struct backing_dev_info *bdi,
         spin_lock_init(&wb->work_lock);
         INIT_LIST_HEAD(&wb->work_list);
         INIT_DELAYED_WORK(&wb->dwork, wb_workfn);
+        wb->dirty_sleep = jiffies;
 
         wb->congested = wb_congested_get_create(bdi, blkcg_id, gfp);
         if (!wb->congested)
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 439cc63ad903..52e2f8e3b472 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -1778,6 +1778,7 @@ pause:
                                           pause,
                                           start_time);
                 __set_current_state(TASK_KILLABLE);
+                wb->dirty_sleep = now;
                 io_schedule_timeout(pause);
 
                 current->dirty_paused_when = now + pause;