commit 392dbeeb0771997e1991a2c540796bbdbe2c65c7
author Akilesh Kailash <akailash@google.com> Wed Feb 03 18:39:01 2021 +0000
committer Akilesh Kailash <akailash@google.com> Wed Feb 03 18:39:01 2021 +0000
tree a93966b97f5aa0e0eafc959d1d23f5b610c2430f
parent 9e082d49525567765fce8c0be697bf61da8f9f27

Remove invalid error message in the merge path.

Bug: 167409187
Test: Compile snapuserd
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: I7a494627b001cb5be20ac6b1bbded64574c3cec0

fs_mgr/libsnapshot/snapuserd.cpp

diff --git a/fs_mgr/libsnapshot/snapuserd.cpp b/fs_mgr/libsnapshot/snapuserd.cpp
index ceba8ab..82db0d3 100644
--- a/fs_mgr/libsnapshot/snapuserd.cpp
+++ b/fs_mgr/libsnapshot/snapuserd.cpp
@@ -391,8 +391,6 @@
     }
 
     if (*copy_op) {
-        SNAP_LOG(ERROR) << "Invalid batch merge of copy ops: merged_ops_cur_iter: "
-                        << merged_ops_cur_iter;
         CHECK(merged_ops_cur_iter == 1);
     }
     return merged_ops_cur_iter;