Revert "update_engine: Merge contiguous operations."
This reverts commit 6a3ea94766bb4972abbd629779914d80dada1245.
The CL is suspected to close the tree due to paygen failures.
See comments inline (delta_diff_generator.cc) for the culprit.
BUG=chromium:486497
TEST=trybot
Change-Id: Iaed694a79371e7de208b0de90f8e9cefd61dd7e6
Reviewed-on: https://chromium-review.googlesource.com/270183
Trybot-Ready: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Cheng-Yi Chiang <cychiang@chromium.org>
Commit-Queue: Cheng-Yi Chiang <cychiang@chromium.org>
Tested-by: Cheng-Yi Chiang <cychiang@chromium.org>
diff --git a/utils.cc b/utils.cc
index 1e94ffa..b25b602 100644
--- a/utils.cc
+++ b/utils.cc
@@ -1676,7 +1676,7 @@
return false;
}
-bool ReadExtents(const std::string& path, const vector<Extent>& extents,
+bool ReadExtents(const std::string& path, vector<Extent>* extents,
chromeos::Blob* out_data, ssize_t out_data_size,
size_t block_size) {
chromeos::Blob data(out_data_size);
@@ -1685,7 +1685,7 @@
TEST_AND_RETURN_FALSE_ERRNO(fd >= 0);
ScopedFdCloser fd_closer(&fd);
- for (const Extent& extent : extents) {
+ for (const Extent& extent : *extents) {
ssize_t bytes_read_this_iteration = 0;
ssize_t bytes = extent.num_blocks() * block_size;
TEST_AND_RETURN_FALSE(bytes_read + bytes <= out_data_size);