Btrfs-progs: fix memory leaks on cleanup

[platform/upstream/btrfs-progs.git] / extent-tree.c

diff --git a/extent-tree.c b/extent-tree.c
index 5c4057e..2d82977 100644 (file)
--- a/extent-tree.c
+++ b/extent-tree.c
@@ -1703,7 +1703,6 @@ int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans,
 
                cache = (struct btrfs_block_group_cache *)(unsigned long)ptr;
                ret = write_one_cache_group(trans, root, path, cache);
-               BUG_ON(ret);
        }
        btrfs_free_path(path);
        return 0;
@@ -1763,6 +1762,8 @@ static void set_avail_alloc_bits(struct btrfs_fs_info *fs_info, u64 flags)
        u64 extra_flags = flags & (BTRFS_BLOCK_GROUP_RAID0 |
                                   BTRFS_BLOCK_GROUP_RAID1 |
                                   BTRFS_BLOCK_GROUP_RAID10 |
+                                  BTRFS_BLOCK_GROUP_RAID5 |
+                                  BTRFS_BLOCK_GROUP_RAID6 |
                                   BTRFS_BLOCK_GROUP_DUP);
        if (extra_flags) {
                if (flags & BTRFS_BLOCK_GROUP_DATA)
@@ -1829,12 +1830,12 @@ static int update_block_group(struct btrfs_trans_handle *trans,
        u64 end;
 
        /* block accounting for super block */
-       old_val = btrfs_super_bytes_used(&info->super_copy);
+       old_val = btrfs_super_bytes_used(info->super_copy);
        if (alloc)
                old_val += num_bytes;
        else
                old_val -= num_bytes;
-       btrfs_set_super_bytes_used(&info->super_copy, old_val);
+       btrfs_set_super_bytes_used(info->super_copy, old_val);
 
        /* block accounting for root item */
        old_val = btrfs_root_used(&root->root_item);
@@ -1894,6 +1895,10 @@ static int update_pinned_extents(struct btrfs_root *root,
        }
        while (num > 0) {
                cache = btrfs_lookup_block_group(fs_info, bytenr);
+               if (!cache) {
+                       len = min((u64)root->sectorsize, num);
+                       goto next;
+               }
                WARN_ON(!cache);
                len = min(num, cache->key.offset -
                          (bytenr - cache->key.objectid));
@@ -1906,6 +1911,7 @@ static int update_pinned_extents(struct btrfs_root *root,
                        cache->space_info->bytes_pinned -= len;
                        fs_info->total_pinned -= len;
                }
+next:
                bytenr += len;
                num -= len;
        }
@@ -1953,6 +1959,21 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans,
        return 0;
 }
 
+static int extent_root_pending_ops(struct btrfs_fs_info *info)
+{
+       u64 start;
+       u64 end;
+       int ret;
+
+       ret = find_first_extent_bit(&info->extent_ins, 0, &start,
+                                   &end, EXTENT_LOCKED);
+       if (!ret) {
+               ret = find_first_extent_bit(&info->pending_del, 0, &start, &end,
+                                           EXTENT_LOCKED);
+       }
+       return ret == 0;
+
+}
 static int finish_current_insert(struct btrfs_trans_handle *trans,
                                 struct btrfs_root *extent_root)
 {
@@ -2068,6 +2089,12 @@ static int __free_extent(struct btrfs_trans_handle *trans,
        u32 item_size;
        u64 refs;
 
+       if (root->fs_info->free_extent_hook) {
+               root->fs_info->free_extent_hook(trans, root, bytenr, num_bytes,
+                                               parent, root_objectid, owner_objectid,
+                                               owner_offset, refs_to_drop);
+
+       }
        path = btrfs_alloc_path();
        if (!path)
                return -ENOMEM;
@@ -2242,9 +2269,7 @@ static int __free_extent(struct btrfs_trans_handle *trans,
                        BUG_ON(ret);
                }
 
-               ret = update_block_group(trans, root, bytenr, num_bytes, 0,
-                                        mark_free);
-               BUG_ON(ret);
+               update_block_group(trans, root, bytenr, num_bytes, 0, mark_free);
        }
 fail:
        btrfs_free_path(path);
@@ -2385,6 +2410,8 @@ static int noinline find_free_extent(struct btrfs_trans_handle *trans,
        WARN_ON(num_bytes < root->sectorsize);
        btrfs_set_key_type(ins, BTRFS_EXTENT_ITEM_KEY);
 
+       search_start = stripe_align(root, search_start);
+
        if (hint_byte) {
                block_group = btrfs_lookup_first_block_group(info, hint_byte);
                if (!block_group)
@@ -2400,6 +2427,7 @@ static int noinline find_free_extent(struct btrfs_trans_handle *trans,
        total_needed += empty_size;
 
 check_failed:
+       search_start = stripe_align(root, search_start);
        if (!block_group) {
                block_group = btrfs_lookup_first_block_group(info,
                                                             search_start);
@@ -2412,7 +2440,6 @@ check_failed:
        if (ret)
                goto error;
 
-       search_start = stripe_align(root, search_start);
        ins->objectid = search_start;
        ins->offset = num_bytes;
 
@@ -2575,13 +2602,7 @@ static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans,
 
        ret = update_block_group(trans, root, ins->objectid, ins->offset,
                                 1, 0);
-       if (ret) {
-               printk(KERN_ERR "btrfs update block group failed for %llu "
-                      "%llu\n", (unsigned long long)ins->objectid,
-                      (unsigned long long)ins->offset);
-               BUG();
-       }
-       return ret;
+       return 0;
 }
 
 static int alloc_tree_block(struct btrfs_trans_handle *trans,
@@ -2982,10 +3003,12 @@ out:
 
 int btrfs_free_block_groups(struct btrfs_fs_info *info)
 {
+       struct btrfs_space_info *sinfo;
        u64 start;
        u64 end;
        u64 ptr;
        int ret;
+
        while(1) {
                ret = find_first_extent_bit(&info->block_group_cache, 0,
                                            &start, &end, (unsigned int)-1);
@@ -3005,6 +3028,13 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info)
                clear_extent_dirty(&info->free_space_cache, start,
                                   end, GFP_NOFS);
        }
+
+       while (!list_empty(&info->space_info)) {
+               sinfo = list_entry(info->space_info.next,
+                                  struct btrfs_space_info, list);
+               list_del_init(&sinfo->list);
+               kfree(sinfo);
+       }
        return 0;
 }
 
@@ -3164,7 +3194,6 @@ int btrfs_make_block_group(struct btrfs_trans_handle *trans,
 
        finish_current_insert(trans, extent_root);
        ret = del_pending_extents(trans, extent_root);
-       BUG_ON(ret);
        set_avail_alloc_bits(extent_root->fs_info, type);
        return 0;
 }
@@ -3196,7 +3225,7 @@ int btrfs_make_block_groups(struct btrfs_trans_handle *trans,
        extent_root = root->fs_info->extent_root;
        block_group_cache = &root->fs_info->block_group_cache;
        chunk_objectid = BTRFS_FIRST_CHUNK_TREE_OBJECTID;
-       total_bytes = btrfs_super_total_bytes(&root->fs_info->super_copy);
+       total_bytes = btrfs_super_total_bytes(root->fs_info->super_copy);
        group_align = 64 * root->sectorsize;
 
        cur_start = 0;
@@ -3380,8 +3409,17 @@ int btrfs_fix_block_accounting(struct btrfs_trans_handle *trans,
 
        root = root->fs_info->extent_root;
 
+       while(extent_root_pending_ops(fs_info)) {
+               ret = finish_current_insert(trans, root);
+               if (ret)
+                       return ret;
+               ret = del_pending_extents(trans, root);
+               if (ret)
+                       return ret;
+       }
+
        while(1) {
-               cache = btrfs_lookup_block_group(fs_info, start);
+               cache = btrfs_lookup_first_block_group(fs_info, start);
                if (!cache)
                        break;
                start = cache->key.objectid + cache->key.offset;
@@ -3422,7 +3460,7 @@ int btrfs_fix_block_accounting(struct btrfs_trans_handle *trans,
                }
                path.slots[0]++;
        }
-       btrfs_set_super_bytes_used(&root->fs_info->super_copy, bytes_used);
+       btrfs_set_super_bytes_used(root->fs_info->super_copy, bytes_used);
        btrfs_release_path(root, &path);
        return 0;
 }