commit e4ebcaac08faa4fd5037161bc59e5b1c50d784db
author Akilesh Kailash <akailash@google.com> Mon Nov 23 06:23:54 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 23 06:23:54 2020 +0000
tree da616d9ce5e250f436b9dc0ac861be379c459fe8
parent 3fc655556542488aee8cec186ef4159b0d92ee8d
parent d83044d0c42447de8a7853c5393943631dee3cc2

Merge "libsnapshot:snapuserd: Fix off by one error in merge path"

fs_mgr/libsnapshot/snapuserd.cpp

diff --git a/fs_mgr/libsnapshot/snapuserd.cpp b/fs_mgr/libsnapshot/snapuserd.cpp
index 3abc457..49e6c3d 100644
--- a/fs_mgr/libsnapshot/snapuserd.cpp
+++ b/fs_mgr/libsnapshot/snapuserd.cpp
@@ -334,7 +334,7 @@
     int merged_ops_cur_iter = 0;
 
     // Find the operations which are merged in this cycle.
-    while ((unmerged_exceptions + merged_ops_cur_iter) <= exceptions_per_area_) {
+    while ((unmerged_exceptions + merged_ops_cur_iter) < exceptions_per_area_) {
         struct disk_exception* merged_de =
                 reinterpret_cast<struct disk_exception*>((char*)merged_buffer + offset);
         struct disk_exception* cow_de =