From: Jens Axboe <axboe@kernel.dk>
Date: Fri, 29 Mar 2013 18:08:40 +0000 (-0600)
Subject: axmap: get rid of old debug ->fail_ok checking
X-Git-Tag: fio-2.0.15~5
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=09d6bf0925d49458802bd9df1fc8dbf493d6cc6f

axmap: get rid of old debug ->fail_ok checking

Don't assert() on not being able to set a bit. We are returning
the number of bits we set anyway, so just have it return 0.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/lib/axmap.c b/lib/axmap.c
index 4fb59e7a..c9f3a4f1 100644
--- a/lib/axmap.c
+++ b/lib/axmap.c
@@ -189,7 +189,6 @@ void axmap_clear(struct axmap *axmap, uint64_t bit_nr)
 struct axmap_set_data {
 	unsigned int nr_bits;
 	unsigned int set_bits;
-	unsigned int fail_ok;
 };
 
 static unsigned long bit_masks[] = {
@@ -229,10 +228,8 @@ static int axmap_set_fn(struct axmap_level *al, unsigned long offset,
 	 * Mask off any potential overlap, only sets contig regions
 	 */
 	overlap = al->map[offset] & mask;
-	if (overlap == mask) {
-		assert(data->fail_ok);
+	if (overlap == mask)
 		return 1;
-	}
 
 	while (overlap) {
 		unsigned long clear_mask = ~(1UL << ffz(~overlap));
@@ -281,7 +278,6 @@ static void __axmap_set(struct axmap *axmap, uint64_t bit_nr,
 		bit_nr += data->set_bits;
 
 		data->nr_bits = nr_bits;
-		data->fail_ok = 1;
 	}
 
 	data->set_bits = set_bits;
@@ -299,10 +295,7 @@ unsigned int axmap_set_nr(struct axmap *axmap, uint64_t bit_nr, unsigned int nr_
 	unsigned int set_bits = 0;
 
 	do {
-		struct axmap_set_data data = {
-						.nr_bits = nr_bits,
-						.fail_ok = set_bits != 0,
-						};
+		struct axmap_set_data data = { .nr_bits = nr_bits, };
 		unsigned int max_bits, this_set;
 
 		max_bits = BLOCKS_PER_UNIT - (bit_nr & BLOCKS_PER_UNIT_MASK);