commit dadd5e33ac00df9a57114487f8441a59fd08bd89
author Sami Tolvanen <samitolvanen@google.com> Thu Oct 29 15:45:17 2015 +0000
committer Sami Tolvanen <samitolvanen@google.com> Thu Oct 29 15:54:27 2015 +0000
tree 29acb8d24f4a66a8ba09c0a1763ce741bca4fde4
parent 4ea2a41464237deabff29bd29a9ffb621ac9f7af

libfec: remove verity validation cache

Caching block validation results increases libfec memory usage and
does not provide comparable benefits in normal use cases, which do
not involve re-reading the same blocks.

Change-Id: I71ac47a7059b350b16e32207932004f3f147abcb

libfec/fec_read.cpp

diff --git a/libfec/fec_read.cpp b/libfec/fec_read.cpp
index 68ea410..3736e33 100644
--- a/libfec/fec_read.cpp
+++ b/libfec/fec_read.cpp
@@ -77,7 +77,7 @@
 
     uint64_t n = offset / FEC_BLOCKSIZE;
 
-    return !verity_check_block(f, n, &f->verity.hash[n * SHA256_DIGEST_LENGTH],
+    return !verity_check_block(f, &f->verity.hash[n * SHA256_DIGEST_LENGTH],
                 data);
 }
 
@@ -327,7 +327,7 @@
             return -1;
         }
 
-        if (likely(verity_check_block(f, curr, hash, data))) {
+        if (likely(verity_check_block(f, hash, data))) {
             goto valid;
         }
 
@@ -352,14 +352,14 @@
            erasure locations is slower */
         if (__ecc_read(f, rs.get(), data, curr_offset, false, ecc_data.get(),
                 errors) == FEC_BLOCKSIZE &&
-            verity_check_block(f, VERITY_NO_CACHE, hash, data)) {
+            verity_check_block(f, hash, data)) {
             goto corrected;
         }
 
         /* try to correct with erasures */
         if (__ecc_read(f, rs.get(), data, curr_offset, true, ecc_data.get(),
                 errors) == FEC_BLOCKSIZE &&
-            verity_check_block(f, VERITY_NO_CACHE, hash, data)) {
+            verity_check_block(f, hash, data)) {
             goto corrected;
         }