1 files changed, 9 insertions, 3 deletions

diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index d636cbcf68f2..bb6a152310ef 100644
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -298,7 +298,7 @@ process_inline:
                 clear_inode_flag(inode, FI_INLINE_DATA);
                 f2fs_put_page(ipage, 1);
         } else if (ri && (ri->i_inline & F2FS_INLINE_DATA)) {
-                if (f2fs_truncate_blocks(inode, 0, false, false))
+                if (f2fs_truncate_blocks(inode, 0, false))
                         return false;
                 goto process_inline;
         }
@@ -470,7 +470,7 @@ static int f2fs_add_inline_entries(struct inode *dir, void *inline_dentry)
         return 0;
 punch_dentry_pages:
         truncate_inode_pages(&dir->i_data, 0);
-        f2fs_truncate_blocks(dir, 0, false, false);
+        f2fs_truncate_blocks(dir, 0, false);
         f2fs_remove_dirty_inode(dir);
         return err;
 }
@@ -659,6 +659,12 @@ int f2fs_read_inline_dir(struct file *file, struct dir_context *ctx,
         if (IS_ERR(ipage))
                 return PTR_ERR(ipage);
 
+        /*
+         * f2fs_readdir was protected by inode.i_rwsem, it is safe to access
+         * ipage without page's lock held.
+         */
+        unlock_page(ipage);
+
         inline_dentry = inline_data_addr(inode, ipage);
 
         make_dentry_ptr_inline(inode, &d, inline_dentry);
@@ -667,7 +673,7 @@ int f2fs_read_inline_dir(struct file *file, struct dir_context *ctx,
         if (!err)
                 ctx->pos = d.max;
 
-        f2fs_put_page(ipage, 1);
+        f2fs_put_page(ipage, 0);
         return err < 0 ? err : 0;
 }