btrfs: use malloc instead of static allocation for chunk map

Now when we have malloc() available, use it instead of static allocation.

Signed-off-by: Alek Du <alek.du@intel.com>
LKML-Reference: <1262073486-21321-1-git-send-email-alek.du@intel.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>

diff --git a/core/fs/btrfs/btrfs.c b/core/fs/btrfs/btrfs.c
index ee420b1..31e24f7 100644 (file)
--- a/core/fs/btrfs/btrfs.c
+++ b/core/fs/btrfs/btrfs.c
@@ -86,6 +86,14 @@ static void insert_map(struct btrfs_chunk_map_item *item)
        int slot;
        int i;
 
+       if (chunk_map.map == NULL) { /* first item */
+               chunk_map.map_length = BTRFS_MAX_CHUNK_ENTRIES;
+               chunk_map.map = (struct btrfs_chunk_map_item *)
+                       malloc(chunk_map.map_length * sizeof(*chunk_map.map));
+               chunk_map.map[0] = *item;
+               chunk_map.cur_length = 1;
+               return;
+       }
        ret = bin_search(chunk_map.map, sizeof(*item), item,
                        (cmp_func)btrfs_comp_chunk_map, 0,
                        chunk_map.cur_length, &slot);

diff --git a/core/fs/btrfs/btrfs.h b/core/fs/btrfs/btrfs.h
index 9ee9092..8ec8afe 100644 (file)
--- a/core/fs/btrfs/btrfs.h
+++ b/core/fs/btrfs/btrfs.h
@@ -197,7 +197,7 @@ struct btrfs_chunk_map_item {
 };
 
 struct btrfs_chunk_map {
-       struct btrfs_chunk_map_item map[BTRFS_MAX_CHUNK_ENTRIES];
+       struct btrfs_chunk_map_item *map;
        u32 map_length;
        u32 cur_length;
 };