Btrfs: Stop using radix trees for the block group cache

[karo-tx-linux.git] / fs / btrfs / ctree.h

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 5262b28f468ccda11ee9acf4e2d3568508b856c0..c6174b27fd136d7f3ef1d1bf3ee05d674957dc71 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -271,8 +271,6 @@ struct btrfs_csum_item {
 } __attribute__ ((__packed__));
 
 /* tag for the radix tree of block groups in ram */
-#define BTRFS_BLOCK_GROUP_DIRTY 0
-#define BTRFS_BLOCK_GROUP_AVAIL 1
 #define BTRFS_BLOCK_GROUP_SIZE (256 * 1024 * 1024)
 
 
@@ -285,7 +283,6 @@ struct btrfs_block_group_item {
 struct btrfs_block_group_cache {
        struct btrfs_key key;
        struct btrfs_block_group_item item;
-       struct radix_tree_root *radix;
        u64 first_free;
        u64 last_alloc;
        u64 pinned;
@@ -301,10 +298,9 @@ struct btrfs_fs_info {
        struct radix_tree_root fs_roots_radix;
        struct radix_tree_root pending_del_radix;
        struct radix_tree_root pinned_radix;
-       struct radix_tree_root block_group_radix;
-       struct radix_tree_root block_group_data_radix;
        struct radix_tree_root extent_ins_radix;
        struct extent_map_tree free_space_cache;
+       struct extent_map_tree block_group_cache;
        u64 generation;
        u64 last_trans_committed;
        struct btrfs_transaction *running_transaction;