3 files changed, 14 insertions, 2 deletions

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index d80882763ffd..2a5999d865b2 100644
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -757,8 +757,15 @@ static void do_checkpoint(struct f2fs_sb_info *sbi, bool is_umount)
         f2fs_put_page(cp_page, 1);
 
         /* wait for previous submitted node/meta pages writeback */
-        while (get_pages(sbi, F2FS_WRITEBACK))
-                congestion_wait(BLK_RW_ASYNC, HZ / 50);
+        sbi->cp_task = current;
+        while (get_pages(sbi, F2FS_WRITEBACK)) {
+                set_current_state(TASK_UNINTERRUPTIBLE);
+                if (!get_pages(sbi, F2FS_WRITEBACK))
+                        break;
+                io_schedule();
+        }
+        __set_current_state(TASK_RUNNING);
+        sbi->cp_task = NULL;
 
         filemap_fdatawait_range(sbi->node_inode->i_mapping, 0, LONG_MAX);
         filemap_fdatawait_range(sbi->meta_inode->i_mapping, 0, LONG_MAX);
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 308967b71674..171c52fc95bb 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -362,6 +362,7 @@ struct f2fs_sb_info {
         struct mutex writepages;                /* mutex for writepages() */
         int por_doing;                          /* recovery is doing or not */
         int on_build_free_nids;                 /* build_free_nids is doing */
+        struct task_struct *cp_task;            /* checkpoint task */
 
         /* for orphan inode management */
         struct list_head orphan_inode_list;     /* orphan inode list */
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index bd79bbeceb1d..3b203597c744 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -597,6 +597,10 @@ static void f2fs_end_io_write(struct bio *bio, int err)
 
         if (p->is_sync)
                 complete(p->wait);
+
+        if (!get_pages(p->sbi, F2FS_WRITEBACK) && p->sbi->cp_task)
+                wake_up_process(p->sbi->cp_task);
+
         kfree(p);
         bio_put(bio);
 }