@@ -2548,6 +2548,8 @@ static void release_blocks_on_commit(jou
count2++;
ext4_lock_group(sb, entry->group);
/* Take it out of per group rb tree */
+ if (db->bb_free_cache == &entry->node)
+ db->bb_free_cache = rb_next(&entry->node);
rb_erase(&entry->node, &(db->bb_free_root));
mb_free_blocks(NULL, &e4b, entry->start_blk, entry->count);
@@ -3188,7 +3190,10 @@ static void ext4_mb_generate_from_freeli
struct ext4_free_data *entry;
grp = ext4_get_group_info(sb, group);
- n = rb_first(&(grp->bb_free_root));
+ if (grp->bb_free_cache)
+ n = grp->bb_free_cache;
+ else
+ n = rb_first(&(grp->bb_free_root));
while (n) {
entry = rb_entry(n, struct ext4_free_data, node);
@@ -4353,6 +4358,7 @@ ext4_mb_free_metadata(handle_t *handle,
struct ext4_sb_info *sbi = EXT4_SB(sb);
struct rb_node **n = &db->bb_free_root.rb_node, *node;
struct rb_node *parent = NULL, *new_node;
+ int left = 1;
BUG_ON(!ext4_handle_valid(handle));
BUG_ON(e4b->bd_bitmap_page == NULL);
@@ -4369,15 +4375,18 @@ ext4_mb_free_metadata(handle_t *handle,
* blocks */
page_cache_get(e4b->bd_buddy_page);
page_cache_get(e4b->bd_bitmap_page);
+ /* just for sure */
+ db->bb_free_cache = 0;
}
while (*n) {
parent = *n;
entry = rb_entry(parent, struct ext4_free_data, node);
if (block < entry->start_blk)
n = &(*n)->rb_left;
- else if (block >= (entry->start_blk + entry->count))
+ else if (block >= (entry->start_blk + entry->count)) {
n = &(*n)->rb_right;
- else {
+ left = 0;
+ } else {
ext4_grp_locked_error(sb, e4b->bd_group, __func__,
"Double free of blocks %d (%d %d)",
block, entry->start_blk, entry->count);
@@ -4387,6 +4396,8 @@ ext4_mb_free_metadata(handle_t *handle,
rb_link_node(new_node, parent, n);
rb_insert_color(new_node, &db->bb_free_root);
+ if (left)
+ db->bb_free_cache = new_node;
/* Now try to see the extent can be merged to left and right */
node = rb_prev(new_node);