4 files changed, 23 insertions, 15 deletions

diff --git a/fs/ext4/crypto.c b/fs/ext4/crypto.c
index 1a0835073663..c8021208a7eb 100644
--- a/fs/ext4/crypto.c
+++ b/fs/ext4/crypto.c
@@ -384,14 +384,12 @@ int ext4_decrypt(struct page *page)
                                 EXT4_DECRYPT, page->index, page, page);
 }
 
-int ext4_encrypted_zeroout(struct inode *inode, struct ext4_extent *ex)
+int ext4_encrypted_zeroout(struct inode *inode, ext4_lblk_t lblk,
+                           ext4_fsblk_t pblk, ext4_lblk_t len)
 {
         struct ext4_crypto_ctx  *ctx;
         struct page             *ciphertext_page = NULL;
         struct bio              *bio;
-        ext4_lblk_t             lblk = le32_to_cpu(ex->ee_block);
-        ext4_fsblk_t            pblk = ext4_ext_pblock(ex);
-        unsigned int            len = ext4_ext_get_actual_len(ex);
         int                     ret, err = 0;
 
 #if 0
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 1008caf3136d..ffc6ab000c78 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -2241,7 +2241,8 @@ void ext4_restore_control_page(struct page *data_page);
 struct page *ext4_encrypt(struct inode *inode,
                           struct page *plaintext_page);
 int ext4_decrypt(struct page *page);
-int ext4_encrypted_zeroout(struct inode *inode, struct ext4_extent *ex);
+int ext4_encrypted_zeroout(struct inode *inode, ext4_lblk_t lblk,
+                           ext4_fsblk_t pblk, ext4_lblk_t len);
 
 #ifdef CONFIG_EXT4_FS_ENCRYPTION
 int ext4_init_crypto(void);
@@ -2495,6 +2496,8 @@ extern int ext4_filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf);
 extern qsize_t *ext4_get_reserved_space(struct inode *inode);
 extern void ext4_da_update_reserve_space(struct inode *inode,
                                         int used, int quota_claim);
+extern int ext4_issue_zeroout(struct inode *inode, ext4_lblk_t lblk,
+                              ext4_fsblk_t pblk, ext4_lblk_t len);
 
 /* indirect.c */
 extern int ext4_ind_map_blocks(handle_t *handle, struct inode *inode,
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 3578b25fccfd..867e98b6bc6c 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -3119,19 +3119,11 @@ static int ext4_ext_zeroout(struct inode *inode, struct ext4_extent *ex)
 {
         ext4_fsblk_t ee_pblock;
         unsigned int ee_len;
-        int ret;
 
         ee_len    = ext4_ext_get_actual_len(ex);
         ee_pblock = ext4_ext_pblock(ex);
-
-        if (ext4_encrypted_inode(inode))
-                return ext4_encrypted_zeroout(inode, ex);
-
-        ret = sb_issue_zeroout(inode->i_sb, ee_pblock, ee_len, GFP_NOFS);
-        if (ret > 0)
-                ret = 0;
-
-        return ret;
+        return ext4_issue_zeroout(inode, le32_to_cpu(ex->ee_block), ee_pblock,
+                                  ee_len);
 }
 
 /*
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index f100c1780e03..0c9a5ee3e106 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -383,6 +383,21 @@ static int __check_block_validity(struct inode *inode, const char *func,
         return 0;
 }
 
+int ext4_issue_zeroout(struct inode *inode, ext4_lblk_t lblk, ext4_fsblk_t pblk,
+                       ext4_lblk_t len)
+{
+        int ret;
+
+        if (ext4_encrypted_inode(inode))
+                return ext4_encrypted_zeroout(inode, lblk, pblk, len);
+
+        ret = sb_issue_zeroout(inode->i_sb, pblk, len, GFP_NOFS);
+        if (ret > 0)
+                ret = 0;
+
+        return ret;
+}
+
 #define check_block_validity(inode, map)        \
         __check_block_validity((inode), __func__, __LINE__, (map))