1 files changed, 21 insertions, 2 deletions

diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index f1c538e5055c..06b30b61205f 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -3461,8 +3461,27 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode,
 
                         ext4_ext_mark_uninitialized(ex);
 
-                        err = ext4_ext_remove_space(inode, map->m_lblk,
-                                map->m_lblk + punched_out);
+                        ext4_ext_invalidate_cache(inode);
+
+                        err = ext4_ext_rm_leaf(handle, inode, path,
+                                map->m_lblk, map->m_lblk + punched_out);
+
+                        if (!err && path->p_hdr->eh_entries == 0) {
+                                /*
+                                 * Punch hole freed all of this sub tree,
+                                 * so we need to correct eh_depth
+                                 */
+                                err = ext4_ext_get_access(handle, inode, path);
+                                if (err == 0) {
+                                        ext_inode_hdr(inode)->eh_depth = 0;
+                                        ext_inode_hdr(inode)->eh_max =
+                                        cpu_to_le16(ext4_ext_space_root(
+                                                inode, 0));
+
+                                        err = ext4_ext_dirty(
+                                                handle, inode, path);
+                                }
+                        }
 
                         goto out2;
                 }