From: Jens Axboe <axboe@fb.com>
Date: Sun, 25 Sep 2016 20:10:24 +0000 (-0600)
Subject: bloom: don't enforce minimum entry count
X-Git-Tag: fio-2.15~29
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=0e4a9bc81d0af7358f14a1c2a9bc3351f1b6a0b1

bloom: don't enforce minimum entry count

We defaulted to 1G of entries, which is crazy. Assume the caller
passes in the right amount.

Fixes: 1b2a83dcda75 ("file: add bloom filter to avoid quadratic lookup behavior")
Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/lib/bloom.c b/lib/bloom.c
index 9ccec5fa..fa38db95 100644
--- a/lib/bloom.c
+++ b/lib/bloom.c
@@ -60,8 +60,6 @@ static struct bloom_hash hashes[] = {
 
 #define N_HASHES	5
 
-#define MIN_ENTRIES	1073741824UL
-
 struct bloom *bloom_new(uint64_t entries)
 {
 	struct bloom *b;
@@ -72,7 +70,6 @@ struct bloom *bloom_new(uint64_t entries)
 	b = malloc(sizeof(*b));
 	b->nentries = entries;
 	no_uints = (entries + BITS_PER_INDEX - 1) / BITS_PER_INDEX;
-	no_uints = max((unsigned long) no_uints, MIN_ENTRIES);
 	b->map = calloc(no_uints, sizeof(uint32_t));
 	if (!b->map) {
 		free(b);