summaryrefslogtreecommitdiffstats
path: root/fs/ext4/inode.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ext4/inode.c')
-rw-r--r--fs/ext4/inode.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index ea39d191dbcb..5a6277d80f7c 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -392,7 +392,7 @@ int ext4_issue_zeroout(struct inode *inode, ext4_lblk_t lblk, ext4_fsblk_t pblk,
392 int ret; 392 int ret;
393 393
394 if (ext4_encrypted_inode(inode)) 394 if (ext4_encrypted_inode(inode))
395 return ext4_encrypted_zeroout(inode, lblk, pblk, len); 395 return fscrypt_zeroout_range(inode, lblk, pblk, len);
396 396
397 ret = sb_issue_zeroout(inode->i_sb, pblk, len, GFP_NOFS); 397 ret = sb_issue_zeroout(inode->i_sb, pblk, len, GFP_NOFS);
398 if (ret > 0) 398 if (ret > 0)
@@ -1158,7 +1158,7 @@ static int ext4_block_write_begin(struct page *page, loff_t pos, unsigned len,
1158 if (unlikely(err)) 1158 if (unlikely(err))
1159 page_zero_new_buffers(page, from, to); 1159 page_zero_new_buffers(page, from, to);
1160 else if (decrypt) 1160 else if (decrypt)
1161 err = ext4_decrypt(page); 1161 err = fscrypt_decrypt_page(page);
1162 return err; 1162 return err;
1163} 1163}
1164#endif 1164#endif
@@ -3735,9 +3735,9 @@ static int __ext4_block_zero_page_range(handle_t *handle,
3735 if (S_ISREG(inode->i_mode) && 3735 if (S_ISREG(inode->i_mode) &&
3736 ext4_encrypted_inode(inode)) { 3736 ext4_encrypted_inode(inode)) {
3737 /* We expect the key to be set. */ 3737 /* We expect the key to be set. */
3738 BUG_ON(!ext4_has_encryption_key(inode)); 3738 BUG_ON(!fscrypt_has_encryption_key(inode));
3739 BUG_ON(blocksize != PAGE_SIZE); 3739 BUG_ON(blocksize != PAGE_SIZE);
3740 WARN_ON_ONCE(ext4_decrypt(page)); 3740 WARN_ON_ONCE(fscrypt_decrypt_page(page));
3741 } 3741 }
3742 } 3742 }
3743 if (ext4_should_journal_data(inode)) { 3743 if (ext4_should_journal_data(inode)) {