commit 7e8a9d9f339554bb97406bdbaef804b2ca9aded3
author Treehugger Robot <treehugger-gerrit@google.com> Thu Sep 02 22:19:42 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 02 22:19:42 2021 +0000
tree 982fc13c9b21b84105d083ae26e690c3c7e23bba
parent 7b0ae4ba7dd62511b32f8044574b39c8d931623f
parent 0518f8cb192fa4ee694f10d007522ab70c40ad15

Merge changes I4fba1982,Ia0812a11

* changes:
  snapuserd: Fix PrepareReadAhead
  Fix a typo

fs_mgr/libsnapshot/snapuserd/snapuserd_readahead.cpp

diff --git a/fs_mgr/libsnapshot/snapuserd/snapuserd_readahead.cpp b/fs_mgr/libsnapshot/snapuserd/snapuserd_readahead.cpp
index b868eed..3bb7a0a 100644
--- a/fs_mgr/libsnapshot/snapuserd/snapuserd_readahead.cpp
+++ b/fs_mgr/libsnapshot/snapuserd/snapuserd_readahead.cpp
@@ -194,10 +194,12 @@
                                        std::vector<uint64_t>& blocks) {
     int num_ops = *pending_ops;
     int nr_consecutive = 0;
+    CHECK_NE(source_offset, nullptr);
 
     if (!RAIterDone() && num_ops) {
         // Get the first block with offset
         const CowOperation* cow_op = GetRAOpIter();
+        CHECK_NE(cow_op, nullptr);
         *source_offset = cow_op->source;
         if (cow_op->type == kCowCopyOp) {
             *source_offset *= BLOCK_SZ;
@@ -216,11 +218,12 @@
          */
         while (!RAIterDone() && num_ops) {
             const CowOperation* op = GetRAOpIter();
+            CHECK_NE(op, nullptr);
             uint64_t next_offset = op->source;
-            if (cow_op->type == kCowCopyOp) {
+            if (op->type == kCowCopyOp) {
                 next_offset *= BLOCK_SZ;
             }
-            if (next_offset != (*source_offset - nr_consecutive * BLOCK_SZ)) {
+            if (next_offset + nr_consecutive * BLOCK_SZ != *source_offset) {
                 break;
             }
             nr_consecutive += 1;