Btrfs: many allocator fixes, pretty solid
Signed-off-by: Chris Mason <chris.mason@oracle.com>
diff --git a/fs/btrfs/bit-radix.c b/fs/btrfs/bit-radix.c
index 1a02714..8f9cd42 100644
--- a/fs/btrfs/bit-radix.c
+++ b/fs/btrfs/bit-radix.c
@@ -77,7 +77,7 @@
}
int find_first_radix_bit(struct radix_tree_root *radix, unsigned long *retbits,
- int nr)
+ unsigned long start, int nr)
{
unsigned long *bits;
unsigned long *gang[4];
@@ -85,10 +85,13 @@
int ret;
int i;
int total_found = 0;
+ unsigned long slot;
- ret = radix_tree_gang_lookup(radix, (void **)gang, 0, ARRAY_SIZE(gang));
+ slot = start / BIT_RADIX_BITS_PER_ARRAY;
+ ret = radix_tree_gang_lookup(radix, (void **)gang, slot,
+ ARRAY_SIZE(gang));
+ found = start % BIT_RADIX_BITS_PER_ARRAY;
for (i = 0; i < ret && nr > 0; i++) {
- found = 0;
bits = gang[i];
while(nr > 0) {
found = find_next_bit(bits + 1,
@@ -104,6 +107,7 @@
} else
break;
}
+ found = 0;
}
return total_found;
}