ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "snapuserd: fix a use of an uninitialized value" am: c08abac855

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1597017

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I28dada5583a7c98588e07b0b8c17ce5431fe3836
This commit is contained in:
George Burgess IV 2021-03-03 23:31:52 +00:00 • committed by Automerger Merge Worker
commit 4fd736ebc5
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
fs_mgr/libsnapshot/snapuserd.cpp
View file

@ -447,16 +447,15 @@ chunk_t Snapuserd::GetNextAllocatableChunkId(chunk_t chunk) {
} }
void Snapuserd::CheckMergeCompletionStatus() { void Snapuserd::CheckMergeCompletionStatus() {
CowHeader header; if (!merge_initiated_) {
SNAP_LOG(INFO) << "Merge was not initiated. Total-data-ops: " << reader_->total_data_ops();
if (merge_initiated_) { return;
reader_->GetHeader(&header);
SNAP_LOG(INFO) << "Merge-status: Total-Merged-ops: " << header.num_merge_ops
<< " Total-data-ops: " << reader_->total_data_ops();
} else {
SNAP_LOG(INFO) << "Merge was not initiated. Total-Merged-ops: " << header.num_merge_ops
<< " Total-data-ops: " << reader_->total_data_ops();
} }
CowHeader header;
reader_->GetHeader(&header);
SNAP_LOG(INFO) << "Merge-status: Total-Merged-ops: " << header.num_merge_ops
<< " Total-data-ops: " << reader_->total_data_ops();
} }
/* /*