Merge "Remove invalid error message in the merge path."

Treehugger Robot · Gerrit Code Review · commit 3ce24b87a26e · 2021-02-03T21:51:30.000Z
diff --git a/fs_mgr/libsnapshot/snapuserd.cpp b/fs_mgr/libsnapshot/snapuserd.cpp
@@ -391,8 +391,6 @@ int Snapuserd::GetNumberOfMergedOps(void* merged_buffer, void* unmerged_buffer,
     }
 
     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;

Original file line number	Diff line number	Diff line change
`@@ -391,8 +391,6 @@ int Snapuserd::GetNumberOfMergedOps(void* merged_buffer, void* unmerged_buffer,`
`391`	`391`	`}`
`392`	`392`
`393`	`393`	`if (*copy_op) {`
`394`		`- SNAP_LOG(ERROR) << "Invalid batch merge of copy ops: merged_ops_cur_iter: "`
`395`		`- << merged_ops_cur_iter;`
`396`	`394`	`CHECK(merged_ops_cur_iter == 1);`
`397`	`395`	`}`
`398`	`396`	`return merged_ops_cur_iter;`