From: Jens Axboe <axboe@fb.com>
Date: Fri, 23 Sep 2016 17:38:58 +0000 (-0600)
Subject: bloom: hashes take byte lengths, not nwords
X-Git-Tag: fio-2.15~35
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=7790f697c858f9f471234d1ec244465a1fc0f8f2

bloom: hashes take byte lengths, not nwords

Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/lib/bloom.c b/lib/bloom.c
index 8594c977..3369c5e9 100644
--- a/lib/bloom.c
+++ b/lib/bloom.c
@@ -88,14 +88,14 @@ void bloom_free(struct bloom *b)
 	free(b);
 }
 
-static bool __bloom_check(struct bloom *b, uint32_t *data, unsigned int nwords,
+static bool __bloom_check(struct bloom *b, void *data, unsigned int len,
 			  bool set)
 {
 	uint32_t hash[N_HASHES];
 	int i, was_set;
 
 	for (i = 0; i < N_HASHES; i++) {
-		hash[i] = hashes[i].fn(data, nwords, hashes[i].seed);
+		hash[i] = hashes[i].fn(data, len, hashes[i].seed);
 		hash[i] = hash[i] % b->nentries;
 	}
 
@@ -115,5 +115,5 @@ static bool __bloom_check(struct bloom *b, uint32_t *data, unsigned int nwords,
 
 bool bloom_set(struct bloom *b, uint32_t *data, unsigned int nwords)
 {
-	return __bloom_check(b, data, nwords, true);
+	return __bloom_check(b, data, nwords * sizeof(uint32_t), true);
 }