CHROMIUM: verity: remove stale code/comments from earlier bitmap design
TBR=wad(already LGTMed and submitted to kernel.git)
BUG=9752
TEST= Ran dm-verity.git unit tests. Ran platform_DMVerityCorruption on H/W.
Change-Id: I6a7f4c21e6bb5a6afd9590fafc1f9b1f93a25700
Signed-off-by: Mandeep Singh Baines <msb@chromium.org>
kernel.git Review URL: http://codereview.chromium.org/6250155
Review URL: http://codereview.chromium.org/6628022
diff --git a/dm-bht.c b/dm-bht.c
index c1c2d19..4ac06fa 100644
--- a/dm-bht.c
+++ b/dm-bht.c
@@ -288,15 +288,6 @@
*/
bht->node_count = 1 << bht->node_count_shift;
- /* TODO(wad) if node_count < DM_BHT_MAX_NODE_COUNT, then retry with
- * node_count_shift-1.
- */
- if (bht->node_count > DM_BHT_MAX_NODE_COUNT) {
- DMERR("node_count maximum node bitmap size");
- status = -EINVAL;
- goto bad_node_count;
- }
-
/* This is unlikely to happen, but with 64k pages, who knows. */
if (bht->node_count > UINT_MAX / bht->digest_size) {
DMERR("node_count * hash_len exceeds UINT_MAX!");
@@ -634,7 +625,6 @@
dm_bht_log_mismatch(bht, &entry->nodes[index], digest);
return DM_BHT_ENTRY_ERROR_MISMATCH;
}
- /* TODO(wad) update bht->block_bitmap here or in the caller */
return 0;
}
diff --git a/dm-bht.h b/dm-bht.h
index 8d6097e..37c501d 100644
--- a/dm-bht.h
+++ b/dm-bht.h
@@ -18,7 +18,6 @@
* max to use for now.
*/
#define DM_BHT_MAX_DIGEST_SIZE 128 /* 1k hashes are unlikely for now */
-#define DM_BHT_MAX_NODE_COUNT 256
/* UNALLOCATED, PENDING, READY, and VERIFIED are valid states. All other
* values are entry-related return codes.