commit c08abac855a215784217725c47a3e7468bbe633d
author George Burgess IV <gbiv@google.com> Wed Mar 03 22:43:36 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 03 22:43:36 2021 +0000
tree 488ab4abdaec29087d123f0b1bf053b0f442dbd5
parent fd8bbd48202d00763ee8d04d17b08e2ac583b4dc
parent a263a88381a3fad800dbdfc8792c89b4c94b8a21

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

fs_mgr/libsnapshot/snapuserd.cpp

diff --git a/fs_mgr/libsnapshot/snapuserd.cpp b/fs_mgr/libsnapshot/snapuserd.cpp
index d620300..4c4a342 100644
--- a/fs_mgr/libsnapshot/snapuserd.cpp
+++ b/fs_mgr/libsnapshot/snapuserd.cpp
@@ -447,16 +447,15 @@
 }
 
 void Snapuserd::CheckMergeCompletionStatus() {
-    CowHeader header;
-
-    if (merge_initiated_) {
-        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();
+    if (!merge_initiated_) {
+        SNAP_LOG(INFO) << "Merge was not initiated. Total-data-ops: " << reader_->total_data_ops();
+        return;
     }
+
+    CowHeader header;
+    reader_->GetHeader(&header);
+    SNAP_LOG(INFO) << "Merge-status: Total-Merged-ops: " << header.num_merge_ops
+                   << " Total-data-ops: " << reader_->total_data_ops();
 }
 
 /*