1 files changed, 20 insertions, 8 deletions

diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index 959df2249875..91ceee0ed4c4 100644
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * fs/f2fs/inode.c
  *
  * Copyright (c) 2012 Samsung Electronics Co., Ltd.
  *             http://www.samsung.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
  */
 #include <linux/fs.h>
 #include <linux/f2fs_fs.h>
@@ -368,6 +365,12 @@ static int do_read_inode(struct inode *inode)
         if (f2fs_has_inline_data(inode) && !f2fs_exist_data(inode))
                 __recover_inline_status(inode, node_page);
 
+        /* try to recover cold bit for non-dir inode */
+        if (!S_ISDIR(inode->i_mode) && !is_cold_node(node_page)) {
+                set_cold_node(node_page, false);
+                set_page_dirty(node_page);
+        }
+
         /* get rdev by using inline_info */
         __get_inode_rdev(inode, ri);
 
@@ -610,6 +613,9 @@ int f2fs_write_inode(struct inode *inode, struct writeback_control *wbc)
         if (!is_inode_flag_set(inode, FI_DIRTY_INODE))
                 return 0;
 
+        if (f2fs_is_checkpoint_ready(sbi))
+                return -ENOSPC;
+
         /*
          * We need to balance fs here to prevent from producing dirty node pages
          * during the urgent cleaning time when runing out of free sections.
@@ -648,7 +654,11 @@ void f2fs_evict_inode(struct inode *inode)
         if (inode->i_nlink || is_bad_inode(inode))
                 goto no_delete;
 
-        dquot_initialize(inode);
+        err = dquot_initialize(inode);
+        if (err) {
+                err = 0;
+                set_sbi_flag(sbi, SBI_QUOTA_NEED_REPAIR);
+        }
 
         f2fs_remove_ino_entry(sbi, inode->i_ino, APPEND_INO);
         f2fs_remove_ino_entry(sbi, inode->i_ino, UPDATE_INO);
@@ -680,9 +690,10 @@ retry:
                 goto retry;
         }
 
-        if (err)
+        if (err) {
                 f2fs_update_inode_page(inode);
-        dquot_free_inode(inode);
+                set_sbi_flag(sbi, SBI_QUOTA_NEED_REPAIR);
+        }
         sb_end_intwrite(inode->i_sb);
 no_delete:
         dquot_drop(inode);
@@ -691,7 +702,8 @@ no_delete:
         stat_dec_inline_dir(inode);
         stat_dec_inline_inode(inode);
 
-        if (likely(!is_set_ckpt_flags(sbi, CP_ERROR_FLAG)))
+        if (likely(!is_set_ckpt_flags(sbi, CP_ERROR_FLAG) &&
+                                !is_sbi_flag_set(sbi, SBI_CP_DISABLED)))
                 f2fs_bug_on(sbi, is_inode_flag_set(inode, FI_DIRTY_INODE));
         else
                 f2fs_inode_synced(inode);