diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index f1cda1900658..8deeb865dbb1 100644
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -763,6 +763,10 @@ void f2fs_update_inode_page(struct inode *inode)
 	struct folio *node_folio;
 	int count = 0;
 retry:
+	if (unlikely(f2fs_cp_error(sbi))) {
+		printk("f2fs: f2fs_update_inode_page bailing out due to cp_error\n");
+		goto stop_checkpoint;
+	}
 	node_folio = f2fs_get_inode_folio(sbi, inode->i_ino);
 	if (IS_ERR(node_folio)) {
 		int err = PTR_ERR(node_folio);