3 files changed, 6 insertions, 2 deletions

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index e9299463be20..1b2b0acbc83d 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -2150,6 +2150,7 @@ static inline void __mark_inode_dirty_flag(struct inode *inode,
         case FI_INLINE_XATTR:
         case FI_INLINE_DATA:
         case FI_INLINE_DENTRY:
+        case FI_NEW_INODE:
                 if (set)
                         return;
         case FI_DATA_EXIST:
diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index 234322889e65..1dc77a40d0ad 100644
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -22,6 +22,9 @@
 
 void f2fs_mark_inode_dirty_sync(struct inode *inode, bool sync)
 {
+        if (is_inode_flag_set(inode, FI_NEW_INODE))
+                return;
+
         if (f2fs_inode_dirtied(inode, sync))
                 return;
 
diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index a885c6e659f8..3ee97ba9d2d7 100644
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -74,12 +74,12 @@ static struct inode *f2fs_new_inode(struct inode *dir, umode_t mode)
         if (err)
                 goto fail_drop;
 
+        set_inode_flag(inode, FI_NEW_INODE);
+
         /* If the directory encrypted, then we should encrypt the inode. */
         if (f2fs_encrypted_inode(dir) && f2fs_may_encrypt(inode))
                 f2fs_set_encrypted_inode(inode);
 
-        set_inode_flag(inode, FI_NEW_INODE);
-
         if (f2fs_sb_has_extra_attr(sbi->sb)) {
                 set_inode_flag(inode, FI_EXTRA_ATTR);
                 F2FS_I(inode)->i_extra_isize = F2FS_TOTAL_EXTRA_ATTR_SIZE;