f2fs: support quota sys files

This patch supports hidden quota files in the system, which will be used for
Android. It requires up-to-date f2fs-tools later than v1.9.0.

Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

1 files changed, 6 insertions, 2 deletions

diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c
index 9626758bc762..92c57ace1939 100644
--- a/fs/f2fs/recovery.c
+++ b/fs/f2fs/recovery.c
@@ -594,6 +594,9 @@ int recover_fsync_data(struct f2fs_sb_info *sbi, bool check_only)
         int ret = 0;
         unsigned long s_flags = sbi->sb->s_flags;
         bool need_writecp = false;
+#ifdef CONFIG_QUOTA
+        int quota_enabled;
+#endif
 
         if (s_flags & MS_RDONLY) {
                 f2fs_msg(sbi->sb, KERN_INFO, "orphan cleanup on readonly fs");
@@ -604,7 +607,7 @@ int recover_fsync_data(struct f2fs_sb_info *sbi, bool check_only)
         /* Needed for iput() to work correctly and not trash data */
         sbi->sb->s_flags |= MS_ACTIVE;
         /* Turn on quotas so that they are updated correctly */
-        f2fs_enable_quota_files(sbi);
+        quota_enabled = f2fs_enable_quota_files(sbi, s_flags & MS_RDONLY);
 #endif
 
         fsync_entry_slab = f2fs_kmem_cache_create("f2fs_fsync_inode_entry",
@@ -665,7 +668,8 @@ skip:
 out:
 #ifdef CONFIG_QUOTA
         /* Turn quotas off */
-        f2fs_quota_off_umount(sbi->sb);
+        if (quota_enabled)
+                f2fs_quota_off_umount(sbi->sb);
 #endif
         sbi->sb->s_flags = s_flags; /* Restore MS_RDONLY status */