This fixes two bugs with the free space cache checker. First is we apparently
always use root->sectorsize for our unit in the kernel so we have to do that in
progs otherwise bitmaps turn out to not look right if we have leafsize !=
sectorsize. The second is a small issue if we had skinny metadata extents set,
we wouldn't advance last properly because we unconditionally use key.offset
instead of root->leafsize. Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
}
if (last == key.objectid) {
}
if (last == key.objectid) {
- last = key.objectid + key.offset;
+ if (key.type == BTRFS_EXTENT_ITEM_KEY)
+ last = key.objectid + key.offset;
+ else
+ last = key.objectid + root->leafsize;
path->slots[0]++;
continue;
}
path->slots[0]++;
continue;
}
start = cache->key.objectid + cache->key.offset;
if (!cache->free_space_ctl) {
start = cache->key.objectid + cache->key.offset;
if (!cache->free_space_ctl) {
- int sectorsize;
-
- if (cache->flags & (BTRFS_BLOCK_GROUP_METADATA |
- BTRFS_BLOCK_GROUP_SYSTEM))
- sectorsize = root->leafsize;
- else
- sectorsize = root->sectorsize;
-
- if (btrfs_init_free_space_ctl(cache, sectorsize)) {
+ if (btrfs_init_free_space_ctl(cache,
+ root->sectorsize)) {