2 files changed, 9 insertions, 0 deletions

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index edc3ce867e9c..7c2ec3ebebe0 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -522,6 +522,12 @@ void f2fs_truncate(struct inode *inode)
 
         trace_f2fs_truncate(inode);
 
+        /* we should check inline_data size */
+        if (f2fs_has_inline_data(inode) && !f2fs_may_inline(inode)) {
+                if (f2fs_convert_inline_inode(inode))
+                        return;
+        }
+
         if (!truncate_blocks(inode, i_size_read(inode), true)) {
                 inode->i_mtime = inode->i_ctime = CURRENT_TIME;
                 mark_inode_dirty(inode);
diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index 231067027745..053d114f0528 100644
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -24,6 +24,9 @@ bool f2fs_may_inline(struct inode *inode)
         if (!S_ISREG(inode->i_mode))
                 return false;
 
+        if (i_size_read(inode) > MAX_INLINE_DATA)
+                return false;
+
         return true;
 }