diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2017-06-14 08:05:32 -0700 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2017-07-21 12:38:01 +0200 |
| commit | 83172ee626df1b1350b28b678f29c02dcd2f9714 (patch) | |
| tree | 618d01d1de51c6387491fb9863579404881f9f94 | |
| parent | 88df41cfe6536190450201e69ac4af5e84a2018d (diff) | |
| download | android_kernel_m2note-83172ee626df1b1350b28b678f29c02dcd2f9714.tar.gz | |
f2fs: don't need to check encrypted inode for partial truncation
The cache_only is always false, if inode is encrypted.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -rw-r--r-- | fs/f2fs/file.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 8c1db7eb7..d1374e4e7 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -555,8 +555,10 @@ static int truncate_partial_data_page(struct inode *inode, u64 from, truncate_out: f2fs_wait_on_page_writeback(page, DATA, true); zero_user(page, offset, PAGE_SIZE - offset); - if (!cache_only || !f2fs_encrypted_inode(inode) || - !S_ISREG(inode->i_mode)) + + /* An encrypted inode should have a key and truncate the last page. */ + f2fs_bug_on(F2FS_I_SB(inode), cache_only && f2fs_encrypted_inode(inode)); + if (!cache_only) set_page_dirty(page); f2fs_put_page(page, 1); return 0; |