diff options
| author | Jaegeuk Kim | 2017-06-14 17:05:32 +0200 |
|---|---|---|
| committer | Jaegeuk Kim | 2017-07-04 11:11:49 +0200 |
| commit | a9bcf9bcd01499001834273ac1114ec76668f048 (patch) | |
| tree | 3f9caab372434dfb75d2dc0c188a78159ac149cd /fs/f2fs | |
| parent | f2fs: measure inode.i_blocks as generic filesystem (diff) | |
| download | kernel-qcow2-linux-a9bcf9bcd01499001834273ac1114ec76668f048.tar.gz kernel-qcow2-linux-a9bcf9bcd01499001834273ac1114ec76668f048.tar.xz kernel-qcow2-linux-a9bcf9bcd01499001834273ac1114ec76668f048.zip | |
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>
Diffstat (limited to 'fs/f2fs')
| -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 7ea63d84a699..6a201c61eef5 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -534,8 +534,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; |