1 files changed, 4 insertions, 1 deletions

diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index bc17ed742845..3e966daaadee 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -524,6 +524,7 @@ ext4_ext_find_extent(struct inode *inode, ext4_lblk_t block,
                 alloc = 1;
         }
         path[0].p_hdr = eh;
+        path[0].p_bh = NULL;
 
         i = depth;
         /* walk through the tree */
@@ -552,12 +553,14 @@ ext4_ext_find_extent(struct inode *inode, ext4_lblk_t block,
         }
 
         path[ppos].p_depth = i;
-        path[ppos].p_hdr = eh;
         path[ppos].p_ext = NULL;
         path[ppos].p_idx = NULL;
 
         /* find extent */
         ext4_ext_binsearch(inode, path + ppos, block);
+        /* if not an empty leaf */
+        if (path[ppos].p_ext)
+                path[ppos].p_block = ext_pblock(path[ppos].p_ext);
 
         ext4_ext_show_path(inode, path);