diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 0ab8fda08f864592f66795fa0bb44edc8ef6f2e4..b6db40a058ed56a43ab9b63e830392496452b943 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -1011,6 +1011,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:
@@ -3382,7 +3384,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 4616d41216f3242a1cd0836f74e3f8eaf04c7b07..5a1faad7cf81b380fe36b7a73caab3642042beda 100644
--- a/fs/ext4/move_extent.c
+++ b/fs/ext4/move_extent.c
@@ -37,7 +37,6 @@ get_ext_path(struct inode *inode, ext4_lblk_t lblock,
 		*ppath = NULL;
 		return -ENODATA;
 	}
-	*ppath = path;
 	return 0;
 }