[RAMEN9610-21536]f2fs: avoid wrong decrypted data from disk

[GitHub/MotorolaMobilityLLC/kernel-slsi.git] / fs / f2fs / file.c

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 9de30472643aaba7de433b62f000c9c934f94254..4edd0d11f25fa920ac1cbd53204893cc0f844fe0 100644 (file)
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -111,8 +111,7 @@ mapped:
        f2fs_wait_on_page_writeback(page, DATA, false);
 
        /* wait for GCed page writeback via META_MAPPING */
-       if (f2fs_post_read_required(inode))
-               f2fs_wait_on_block_writeback(sbi, dn.data_blkaddr);
+       f2fs_wait_on_block_writeback(inode, dn.data_blkaddr);
 
 out_sem:
        up_read(&F2FS_I(inode)->i_mmap_sem);
@@ -217,6 +216,9 @@ static int f2fs_do_sync_file(struct file *file, loff_t start, loff_t end,
 
        trace_f2fs_sync_file_enter(inode);
 
+       if (S_ISDIR(inode->i_mode))
+               goto go_write;
+
        /* if fdatasync is triggered, let's do in-place-update */
        if (datasync || get_dirty_pages(inode) <= SM_I(sbi)->min_fsync_blocks)
                set_inode_flag(inode, FI_NEED_IPU);