diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index f5052f99b2f8e0ad81fde35ff36b4fa5cc87cd5b..b5469abc5a153ef6101fd98b7ea88938a4539f24 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -968,6 +968,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:
@@ -3258,7 +3260,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 2b6288c2df435281485cf92a4808b08c1dad39f4..45191e01fbbc8ecc7de847a3b48f562812145b38 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;
 }