1 files changed, 33 insertions, 7 deletions

diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index 383db1fabcf4..1bba5228c197 100644
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -81,8 +81,10 @@ static int __f2fs_convert_inline_data(struct inode *inode, struct page *page)
 
         f2fs_lock_op(sbi);
         ipage = get_node_page(sbi, inode->i_ino);
-        if (IS_ERR(ipage))
-                return PTR_ERR(ipage);
+        if (IS_ERR(ipage)) {
+                err = PTR_ERR(ipage);
+                goto out;
+        }
 
         /*
          * i_addr[0] is not used for inline data,
@@ -90,11 +92,10 @@ static int __f2fs_convert_inline_data(struct inode *inode, struct page *page)
          */
         set_new_dnode(&dn, inode, ipage, NULL, 0);
         err = f2fs_reserve_block(&dn, 0);
-        if (err) {
-                f2fs_unlock_op(sbi);
-                return err;
-        }
+        if (err)
+                goto out;
 
+        f2fs_wait_on_page_writeback(page, DATA);
         zero_user_segment(page, MAX_INLINE_DATA, PAGE_CACHE_SIZE);
 
         /* Copy the whole inline data block */
@@ -118,6 +119,7 @@ static int __f2fs_convert_inline_data(struct inode *inode, struct page *page)
 
         sync_inode_page(&dn);
         f2fs_put_dnode(&dn);
+out:
         f2fs_unlock_op(sbi);
         return err;
 }
@@ -132,7 +134,7 @@ int f2fs_convert_inline_data(struct inode *inode, pgoff_t to_size)
         else if (to_size <= MAX_INLINE_DATA)
                 return 0;
 
-        page = grab_cache_page_write_begin(inode->i_mapping, 0, AOP_FLAG_NOFS);
+        page = grab_cache_page(inode->i_mapping, 0);
         if (!page)
                 return -ENOMEM;
 
@@ -155,6 +157,7 @@ int f2fs_write_inline_data(struct inode *inode,
                 return err;
         ipage = dn.inode_page;
 
+        f2fs_wait_on_page_writeback(ipage, NODE);
         zero_user_segment(ipage, INLINE_DATA_OFFSET,
                                  INLINE_DATA_OFFSET + MAX_INLINE_DATA);
         src_addr = kmap(page);
@@ -175,6 +178,26 @@ int f2fs_write_inline_data(struct inode *inode,
         return 0;
 }
 
+void truncate_inline_data(struct inode *inode, u64 from)
+{
+        struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
+        struct page *ipage;
+
+        if (from >= MAX_INLINE_DATA)
+                return;
+
+        ipage = get_node_page(sbi, inode->i_ino);
+        if (IS_ERR(ipage))
+                return;
+
+        f2fs_wait_on_page_writeback(ipage, NODE);
+
+        zero_user_segment(ipage, INLINE_DATA_OFFSET + from,
+                                INLINE_DATA_OFFSET + MAX_INLINE_DATA);
+        set_page_dirty(ipage);
+        f2fs_put_page(ipage, 1);
+}
+
 int recover_inline_data(struct inode *inode, struct page *npage)
 {
         struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
@@ -199,6 +222,8 @@ process_inline:
                 ipage = get_node_page(sbi, inode->i_ino);
                 f2fs_bug_on(IS_ERR(ipage));
 
+                f2fs_wait_on_page_writeback(ipage, NODE);
+
                 src_addr = inline_data_addr(npage);
                 dst_addr = inline_data_addr(ipage);
                 memcpy(dst_addr, src_addr, MAX_INLINE_DATA);
@@ -210,6 +235,7 @@ process_inline:
         if (f2fs_has_inline_data(inode)) {
                 ipage = get_node_page(sbi, inode->i_ino);
                 f2fs_bug_on(IS_ERR(ipage));
+                f2fs_wait_on_page_writeback(ipage, NODE);
                 zero_user_segment(ipage, INLINE_DATA_OFFSET,
                                  INLINE_DATA_OFFSET + MAX_INLINE_DATA);
                 clear_inode_flag(F2FS_I(inode), FI_INLINE_DATA);