tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "updater: Drop the 'blocks' parameter in LoadStash()."

Browse source
This commit is contained in:
Tao Bao 2018-05-31 20:22:25 +00:00 committed by Gerrit Code Review
commit 0b80ba14d7
1 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
updater/blockimg.cpp
View file

@ -751,7 +751,7 @@ static void DeleteStash(const std::string& base) {
} }
} }
static int LoadStash(CommandParameters& params, const std::string& id, bool verify, size_t* blocks, static int LoadStash(CommandParameters& params, const std::string& id, bool verify,
std::vector<uint8_t>& buffer, bool printnoent) { std::vector<uint8_t>& buffer, bool printnoent) {
// In verify mode, if source range_set was saved for the given hash, check contents in the source // In verify mode, if source range_set was saved for the given hash, check contents in the source
// blocks first. If the check fails, search for the stashed files on /cache as usual. // blocks first. If the check fails, search for the stashed files on /cache as usual.
@ -773,11 +773,6 @@ static int LoadStash(CommandParameters& params, const std::string& id, bool veri
} }
} }
size_t blockcount = 0;
if (!blocks) {
blocks = &blockcount;
}
std::string fn = GetStashFileName(params.stashbase, id, ""); std::string fn = GetStashFileName(params.stashbase, id, "");
struct stat sb; struct stat sb;
@ -808,9 +803,8 @@ static int LoadStash(CommandParameters& params, const std::string& id, bool veri
return -1; return -1;
} }
*blocks = sb.st_size / BLOCKSIZE; size_t blocks = sb.st_size / BLOCKSIZE;
if (verify && VerifyBlocks(id, buffer, blocks, true) != 0) {
if (verify && VerifyBlocks(id, buffer, *blocks, true) != 0) {
LOG(ERROR) << "unexpected contents in " << fn; LOG(ERROR) << "unexpected contents in " << fn;
if (stash_map.find(id) == stash_map.end()) { if (stash_map.find(id) == stash_map.end()) {
LOG(ERROR) << "failed to find source blocks number for stash " << id LOG(ERROR) << "failed to find source blocks number for stash " << id
@ -1056,7 +1050,7 @@ static int LoadSourceBlocks(CommandParameters& params, const RangeSet& tgt, size
} }
std::vector<uint8_t> stash; std::vector<uint8_t> stash;
if (LoadStash(params, tokens[0], false, nullptr, stash, true) == -1) { if (LoadStash(params, tokens[0], false, stash, true) == -1) {
// These source blocks will fail verification if used later, but we // These source blocks will fail verification if used later, but we
// will let the caller decide if this is a fatal failure // will let the caller decide if this is a fatal failure
LOG(ERROR) << "failed to load stash " << tokens[0]; LOG(ERROR) << "failed to load stash " << tokens[0];
@ -1171,7 +1165,7 @@ static int LoadSrcTgtVersion3(CommandParameters& params, RangeSet& tgt, size_t*
return 0; return 0;
} }
if (*overlap && LoadStash(params, srchash, true, nullptr, params.buffer, true) == 0) { if (*overlap && LoadStash(params, srchash, true, params.buffer, true) == 0) {
// Overlapping source blocks were previously stashed, command can proceed. We are recovering // Overlapping source blocks were previously stashed, command can proceed. We are recovering
// from an interrupted command, so we don't know if the stash can safely be deleted after this // from an interrupted command, so we don't know if the stash can safely be deleted after this
// command. // command.
@ -1237,8 +1231,7 @@ static int PerformCommandStash(CommandParameters& params) {
} }
const std::string& id = params.tokens[params.cpos++]; const std::string& id = params.tokens[params.cpos++];
size_t blocks = 0; if (LoadStash(params, id, true, params.buffer, false) == 0) {
if (LoadStash(params, id, true, &blocks, params.buffer, false) == 0) {
// Stash file already exists and has expected contents. Do not read from source again, as the // Stash file already exists and has expected contents. Do not read from source again, as the
// source may have been already overwritten during a previous attempt. // source may have been already overwritten during a previous attempt.
return 0; return 0;
@ -1247,11 +1240,11 @@ static int PerformCommandStash(CommandParameters& params) {
RangeSet src = RangeSet::Parse(params.tokens[params.cpos++]); RangeSet src = RangeSet::Parse(params.tokens[params.cpos++]);
CHECK(static_cast<bool>(src)); CHECK(static_cast<bool>(src));
allocate(src.blocks() * BLOCKSIZE, params.buffer); size_t blocks = src.blocks();
allocate(blocks * BLOCKSIZE, params.buffer);
if (ReadBlocks(src, params.buffer, params.fd) == -1) { if (ReadBlocks(src, params.buffer, params.fd) == -1) {
return -1; return -1;
} }
blocks = src.blocks();
stash_map[id] = src; stash_map[id] = src;
if (VerifyBlocks(id, params.buffer, blocks, true) != 0) { if (VerifyBlocks(id, params.buffer, blocks, true) != 0) {