Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d69f2d7 authored by George Burgess IV's avatar George Burgess IV Committed by Automerger Merge Worker
Browse files

Merge "snapuserd: fix a use of an uninitialized value" am: c08abac8 am: 4fd736eb 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5714737fb545885b8b48c06fc42ab2214a7f4fa7
parents bcffc0dd 4fd736eb

fs_mgr/libsnapshot/snapuserd.cpp

+8 −9
Original line number Diff line number Diff line
@@ -447,16 +447,15 @@ chunk_t Snapuserd::GetNextAllocatableChunkId(chunk_t chunk) { 
}



void Snapuserd::CheckMergeCompletionStatus() {

    CowHeader header;

    if (!merge_initiated_) {

        SNAP_LOG(INFO) << "Merge was not initiated. Total-data-ops: " << reader_->total_data_ops();

        return;

    }



    if (merge_initiated_) {

    CowHeader header;

    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();

    }

}



/*