3 files changed, 5 insertions, 4 deletions

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 7f9cb0bba104..c25c67868b98 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -3422,7 +3422,7 @@ static inline void f2fs_set_encrypted_inode(struct inode *inode)
 {
 #ifdef CONFIG_F2FS_FS_ENCRYPTION
         file_set_encrypt(inode);
-        inode->i_flags |= S_ENCRYPTED;
+        f2fs_set_inode_flags(inode);
 #endif
 }
 
diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index a54577e417b1..54295b5c1822 100644
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -122,6 +122,8 @@ static struct inode *f2fs_new_inode(struct inode *dir, umode_t mode)
         if (F2FS_I(inode)->i_flags & F2FS_PROJINHERIT_FL)
                 set_inode_flag(inode, FI_PROJ_INHERIT);
 
+        f2fs_set_inode_flags(inode);
+
         trace_f2fs_new_inode(inode, 0);
         return inode;
 
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 262a27744eb1..bb88ae62ae6f 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1939,8 +1939,7 @@ static int f2fs_quota_on(struct super_block *sb, int type, int format_id,
 
         inode_lock(inode);
         F2FS_I(inode)->i_flags |= F2FS_NOATIME_FL | F2FS_IMMUTABLE_FL;
-        inode_set_flags(inode, S_NOATIME | S_IMMUTABLE,
-                                        S_NOATIME | S_IMMUTABLE);
+        f2fs_set_inode_flags(inode);
         inode_unlock(inode);
         f2fs_mark_inode_dirty_sync(inode, false);
 
@@ -1965,7 +1964,7 @@ static int f2fs_quota_off(struct super_block *sb, int type)
 
         inode_lock(inode);
         F2FS_I(inode)->i_flags &= ~(F2FS_NOATIME_FL | F2FS_IMMUTABLE_FL);
-        inode_set_flags(inode, 0, S_NOATIME | S_IMMUTABLE);
+        f2fs_set_inode_flags(inode);
         inode_unlock(inode);
         f2fs_mark_inode_dirty_sync(inode, false);
 out_put: