diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index af7b253dfe86688dda9b978560e217f372368806..018b99d837ea1fca49e3bd7d023596188d29bee9 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -960,6 +960,8 @@ ext4_find_extent(struct inode *inode, ext4_lblk_t block,
 
 	ext4_ext_show_path(inode, path);
 
+	if (orig_path)
+		*orig_path = path;
 	return path;
 
 err:
@@ -3282,7 +3284,6 @@ static int ext4_split_extent_at(handle_t *handle,
 	}
 	depth = ext_depth(inode);
 	ex = path[depth].p_ext;
-	*ppath = path;
 
 	if (EXT4_EXT_MAY_ZEROOUT & split_flag) {
 		if (split_flag & (EXT4_EXT_DATA_VALID1|EXT4_EXT_DATA_VALID2)) {
diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c
index f3d06beb79b2cb39841ceb01f4f3075c3c390c52..886d2b161c234feea475772e8986ff4107fd7042 100644
--- a/fs/ext4/move_extent.c
+++ b/fs/ext4/move_extent.c
@@ -36,7 +36,6 @@ get_ext_path(struct inode *inode, ext4_lblk_t lblock,
 		*ppath = NULL;
 		return -ENODATA;
 	}
-	*ppath = path;
 	return 0;
 }