2 files changed, 9 insertions, 3 deletions

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index 9f5317c9ad72..231d8c9fea0a 100644
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -1043,7 +1043,8 @@ void write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)
 
         mutex_lock(&sbi->cp_mutex);
 
-        if (!sbi->s_dirty && cpc->reason != CP_DISCARD)
+        if (!sbi->s_dirty &&
+                        cpc->reason != CP_DISCARD && cpc->reason != CP_UMOUNT)
                 goto out;
         if (unlikely(f2fs_cp_error(sbi)))
                 goto out;
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 84f95cd4076a..0d627f2d1828 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -447,8 +447,13 @@ static void f2fs_put_super(struct super_block *sb)
         f2fs_destroy_stats(sbi);
         stop_gc_thread(sbi);
 
-        /* We don't need to do checkpoint when it's clean */
-        if (sbi->s_dirty) {
+        /*
+         * We don't need to do checkpoint when superblock is clean.
+         * But, the previous checkpoint was not done by umount, it needs to do
+         * clean checkpoint again.
+         */
+        if (sbi->s_dirty ||
+                        !is_set_ckpt_flags(F2FS_CKPT(sbi), CP_UMOUNT_FLAG)) {
                 struct cp_control cpc = {
                         .reason = CP_UMOUNT,
                 };