|
@@ -1175,6 +1175,16 @@ static void add_new_bitmap(struct btrfs_block_group_cache *block_group,
|
|
|
recalculate_thresholds(block_group);
|
|
|
}
|
|
|
|
|
|
+static void free_bitmap(struct btrfs_block_group_cache *block_group,
|
|
|
+ struct btrfs_free_space *bitmap_info)
|
|
|
+{
|
|
|
+ unlink_free_space(block_group, bitmap_info);
|
|
|
+ kfree(bitmap_info->bitmap);
|
|
|
+ kfree(bitmap_info);
|
|
|
+ block_group->total_bitmaps--;
|
|
|
+ recalculate_thresholds(block_group);
|
|
|
+}
|
|
|
+
|
|
|
static noinline int remove_from_bitmap(struct btrfs_block_group_cache *block_group,
|
|
|
struct btrfs_free_space *bitmap_info,
|
|
|
u64 *offset, u64 *bytes)
|
|
@@ -1215,13 +1225,8 @@ again:
|
|
|
|
|
|
if (*bytes) {
|
|
|
struct rb_node *next = rb_next(&bitmap_info->offset_index);
|
|
|
- if (!bitmap_info->bytes) {
|
|
|
- unlink_free_space(block_group, bitmap_info);
|
|
|
- kfree(bitmap_info->bitmap);
|
|
|
- kfree(bitmap_info);
|
|
|
- block_group->total_bitmaps--;
|
|
|
- recalculate_thresholds(block_group);
|
|
|
- }
|
|
|
+ if (!bitmap_info->bytes)
|
|
|
+ free_bitmap(block_group, bitmap_info);
|
|
|
|
|
|
/*
|
|
|
* no entry after this bitmap, but we still have bytes to
|
|
@@ -1254,13 +1259,8 @@ again:
|
|
|
return -EAGAIN;
|
|
|
|
|
|
goto again;
|
|
|
- } else if (!bitmap_info->bytes) {
|
|
|
- unlink_free_space(block_group, bitmap_info);
|
|
|
- kfree(bitmap_info->bitmap);
|
|
|
- kfree(bitmap_info);
|
|
|
- block_group->total_bitmaps--;
|
|
|
- recalculate_thresholds(block_group);
|
|
|
- }
|
|
|
+ } else if (!bitmap_info->bytes)
|
|
|
+ free_bitmap(block_group, bitmap_info);
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
@@ -1689,13 +1689,8 @@ u64 btrfs_find_space_for_alloc(struct btrfs_block_group_cache *block_group,
|
|
|
ret = offset;
|
|
|
if (entry->bitmap) {
|
|
|
bitmap_clear_bits(block_group, entry, offset, bytes);
|
|
|
- if (!entry->bytes) {
|
|
|
- unlink_free_space(block_group, entry);
|
|
|
- kfree(entry->bitmap);
|
|
|
- kfree(entry);
|
|
|
- block_group->total_bitmaps--;
|
|
|
- recalculate_thresholds(block_group);
|
|
|
- }
|
|
|
+ if (!entry->bytes)
|
|
|
+ free_bitmap(block_group, entry);
|
|
|
} else {
|
|
|
unlink_free_space(block_group, entry);
|
|
|
entry->offset += bytes;
|