f2fs: trigger correct checkpoint during umount

This patch fixes to trigger checkpoint with umount flag when kill_sb was called.
In kill_sb, f2fs_sync_fs was finally called, but at this time, f2fs can't do
checkpoint with CP_UMOUNT.
After then, f2fs_put_super is not doing checkpoint, since it is not dirty.

So, this patch adds a flag to indicate f2fs_sync_fs is called during umount.

Reviewed-by: Chao Yu <chao2.yu@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

1 files changed, 10 insertions, 2 deletions

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 0e97974bbbbd..84f95cd4076a 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -487,7 +487,8 @@ int f2fs_sync_fs(struct super_block *sb, int sync)
         if (sync) {
                 struct cp_control cpc;
 
-                cpc.reason = test_opt(sbi, FASTBOOT) ? CP_UMOUNT : CP_SYNC;
+                cpc.reason = (test_opt(sbi, FASTBOOT) || sbi->s_closing) ?
+                                                        CP_UMOUNT : CP_SYNC;
                 mutex_lock(&sbi->gc_mutex);
                 write_checkpoint(sbi, &cpc);
                 mutex_unlock(&sbi->gc_mutex);
@@ -1190,11 +1191,18 @@ static struct dentry *f2fs_mount(struct file_system_type *fs_type, int flags,
         return mount_bdev(fs_type, flags, dev_name, data, f2fs_fill_super);
 }
 
+static void kill_f2fs_super(struct super_block *sb)
+{
+        if (sb->s_root)
+                F2FS_SB(sb)->s_closing = true;
+        kill_block_super(sb);
+}
+
 static struct file_system_type f2fs_fs_type = {
         .owner          = THIS_MODULE,
         .name           = "f2fs",
         .mount          = f2fs_mount,
-        .kill_sb        = kill_block_super,
+        .kill_sb        = kill_f2fs_super,
         .fs_flags       = FS_REQUIRES_DEV,
 };
 MODULE_ALIAS_FS("f2fs");