8ce292
diff --git a/btrfsck.c b/btrfsck.c
Josef Bacik 857026
index 63e44d1..1ae7487 100644
8ce292
--- a/btrfsck.c
8ce292
+++ b/btrfsck.c
Josef Bacik 857026
@@ -2806,6 +2806,8 @@ static int check_extents(struct btrfs_root *root)
8ce292
 			break;
8ce292
 	}
8ce292
 	ret = check_extent_refs(root, &extent_cache);
8ce292
+	free_cache_tree(&seen);
8ce292
+	free(bits);
8ce292
 	return ret;
8ce292
 }
8ce292
 
8ce292
diff --git a/disk-io.c b/disk-io.c
Josef Bacik 857026
index a6e1000..b903163 100644
8ce292
--- a/disk-io.c
8ce292
+++ b/disk-io.c
8ce292
@@ -425,8 +425,10 @@ static int find_and_setup_log_root(struct btrfs_root *tree_root,
8ce292
 	u64 blocknr = btrfs_super_log_root(disk_super);
8ce292
 	struct btrfs_root *log_root = malloc(sizeof(struct btrfs_root));
8ce292
 
8ce292
-	if (blocknr == 0)
8ce292
+	if (blocknr == 0) {
8ce292
+		free(log_root);
8ce292
 		return 0;
8ce292
+	}
8ce292
 
8ce292
 	blocksize = btrfs_level_size(tree_root,
8ce292
 			     btrfs_super_log_root_level(disk_super));
8ce292
@@ -605,7 +607,7 @@ struct btrfs_root *open_ctree_fd(int fp, const char *path, u64 sb_bytenr,
8ce292
 	struct btrfs_root *chunk_root = malloc(sizeof(struct btrfs_root));
8ce292
 	struct btrfs_root *dev_root = malloc(sizeof(struct btrfs_root));
8ce292
 	struct btrfs_root *csum_root = malloc(sizeof(struct btrfs_root));
8ce292
-	struct btrfs_fs_info *fs_info = malloc(sizeof(*fs_info));
8ce292
+	struct btrfs_fs_info *fs_info = malloc(sizeof(struct btrfs_fs_info));
8ce292
 	int ret;
8ce292
 	struct btrfs_super_block *disk_super;
8ce292
 	struct btrfs_fs_devices *fs_devices = NULL;
8ce292
@@ -628,7 +630,7 @@ struct btrfs_root *open_ctree_fd(int fp, const char *path, u64 sb_bytenr,
8ce292
 		BUG_ON(ret);
8ce292
 	}
8ce292
 
8ce292
-	memset(fs_info, 0, sizeof(*fs_info));
8ce292
+	memset(fs_info, 0, sizeof(struct btrfs_fs_info));
8ce292
 	fs_info->tree_root = tree_root;
8ce292
 	fs_info->extent_root = extent_root;
8ce292
 	fs_info->chunk_root = chunk_root;
8ce292
@@ -928,15 +930,19 @@ static int close_all_devices(struct btrfs_fs_info *fs_info)
8ce292
 {
8ce292
 	struct list_head *list;
8ce292
 	struct list_head *next;
8ce292
+	struct list_head *tmp;
8ce292
 	struct btrfs_device *device;
8ce292
 
8ce292
-	return 0;
8ce292
-
8ce292
 	list = &fs_info->fs_devices->devices;
8ce292
-	list_for_each(next, list) {
8ce292
+	list_for_each_safe(next, tmp, list) {
8ce292
 		device = list_entry(next, struct btrfs_device, dev_list);
8ce292
 		close(device->fd);
8ce292
+		list_del(&device->dev_list);
8ce292
+		free(device->name);
8ce292
+		free(device->label);
8ce292
+		free(device);
8ce292
 	}
8ce292
+	free(fs_info->fs_devices);
8ce292
 	return 0;
8ce292
 }
8ce292
 
Josef Bacik 857026
@@ -983,12 +989,14 @@ int close_ctree(struct btrfs_root *root)
8ce292
 	extent_io_tree_cleanup(&fs_info->pinned_extents);
8ce292
 	extent_io_tree_cleanup(&fs_info->pending_del);
8ce292
 	extent_io_tree_cleanup(&fs_info->extent_ins);
8ce292
+	btrfs_mapping_tree_free(&fs_info->mapping_tree);
8ce292
 
8ce292
 	free(fs_info->tree_root);
8ce292
 	free(fs_info->extent_root);
8ce292
 	free(fs_info->chunk_root);
8ce292
 	free(fs_info->dev_root);
8ce292
 	free(fs_info->csum_root);
8ce292
+	free(fs_info->log_root_tree);
8ce292
 	free(fs_info);
8ce292
 
8ce292
 	return 0;
8ce292
diff --git a/extent-cache.c b/extent-cache.c
8ce292
index b871e18..b424975 100644
8ce292
--- a/extent-cache.c
8ce292
+++ b/extent-cache.c
8ce292
@@ -170,3 +170,14 @@ void remove_cache_extent(struct cache_tree *tree,
8ce292
 	rb_erase(&pe->rb_node, &tree->root);
8ce292
 }
8ce292
 
8ce292
+void free_cache_tree(struct cache_tree *tree)
8ce292
+{
8ce292
+	struct rb_node *node;
8ce292
+	struct cache_extent *cache;
8ce292
+
8ce292
+	while ((node = rb_last(&tree->root)) != NULL) {
8ce292
+		cache = rb_entry(node, struct cache_extent, rb_node);
8ce292
+		remove_cache_extent(tree, cache);
8ce292
+		free(cache);
8ce292
+	}
8ce292
+}
8ce292
diff --git a/extent-cache.h b/extent-cache.h
8ce292
index 7f2f2a6..1696bc2 100644
8ce292
--- a/extent-cache.h
8ce292
+++ b/extent-cache.h
8ce292
@@ -43,6 +43,7 @@ struct cache_extent *find_cache_extent(struct cache_tree *tree,
8ce292
 int insert_cache_extent(struct cache_tree *tree, u64 start, u64 size);
8ce292
 int insert_existing_cache_extent(struct cache_tree *tree,
8ce292
 				 struct cache_extent *pe);
8ce292
+void free_cache_tree(struct cache_tree *tree);
8ce292
 
8ce292
 static inline int cache_tree_empty(struct cache_tree *tree)
8ce292
 {
8ce292
diff --git a/extent-tree.c b/extent-tree.c
8ce292
index b2f9bb2..e1d7ffd 100644
8ce292
--- a/extent-tree.c
8ce292
+++ b/extent-tree.c
8ce292
@@ -2985,6 +2985,7 @@ out:
8ce292
 
8ce292
 int btrfs_free_block_groups(struct btrfs_fs_info *info)
8ce292
 {
8ce292
+	struct btrfs_space_info *space_info;
8ce292
 	u64 start;
8ce292
 	u64 end;
8ce292
 	u64 ptr;
8ce292
@@ -3008,6 +3009,15 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info)
8ce292
 		clear_extent_dirty(&info->free_space_cache, start,
8ce292
 				   end, GFP_NOFS);
8ce292
 	}
8ce292
+
8ce292
+	while (!list_empty(&info->space_info)) {
8ce292
+		space_info = list_entry(info->space_info.next,
8ce292
+					struct btrfs_space_info,
8ce292
+					list);
8ce292
+		list_del(&space_info->list);
8ce292
+		kfree(space_info);
8ce292
+	}
8ce292
+
8ce292
 	return 0;
8ce292
 }
8ce292
 
8ce292
diff --git a/extent_io.c b/extent_io.c
8ce292
index 069c199..71e6826 100644
8ce292
--- a/extent_io.c
8ce292
+++ b/extent_io.c
8ce292
@@ -572,6 +572,7 @@ static struct extent_buffer *__alloc_extent_buffer(struct extent_io_tree *tree,
8ce292
 		BUG();
8ce292
 		return NULL;
8ce292
 	}
8ce292
+	memset(eb, 0, sizeof(struct extent_buffer) + blocksize);
8ce292
 
8ce292
 	eb->start = bytenr;
8ce292
 	eb->len = blocksize;
8ce292
diff --git a/volumes.c b/volumes.c
8ce292
index 7671855..eee66a7 100644
8ce292
--- a/volumes.c
8ce292
+++ b/volumes.c
8ce292
@@ -862,6 +862,20 @@ void btrfs_mapping_init(struct btrfs_mapping_tree *tree)
8ce292
 	cache_tree_init(&tree->cache_tree);
8ce292
 }
8ce292
 
8ce292
+void btrfs_mapping_tree_free(struct btrfs_mapping_tree *tree)
8ce292
+{
8ce292
+	struct cache_extent *cache;
8ce292
+	struct rb_node *node;
8ce292
+	struct map_lookup *map;
8ce292
+
8ce292
+	while ((node = rb_last(&tree->cache_tree.root)) != NULL) {
8ce292
+		cache = rb_entry(node, struct cache_extent, rb_node);
8ce292
+		map = container_of(cache, struct map_lookup, ce);
8ce292
+		remove_cache_extent(&tree->cache_tree, cache);
8ce292
+		free(map);
8ce292
+	}
8ce292
+}
8ce292
+
8ce292
 int btrfs_num_copies(struct btrfs_mapping_tree *map_tree, u64 logical, u64 len)
8ce292
 {
8ce292
 	struct cache_extent *ce;
8ce292
@@ -1340,7 +1354,7 @@ int btrfs_read_sys_array(struct btrfs_root *root)
8ce292
 	if (!sb)
8ce292
 		return -ENOMEM;
8ce292
 	btrfs_set_buffer_uptodate(sb);
8ce292
-	write_extent_buffer(sb, super_copy, 0, BTRFS_SUPER_INFO_SIZE);
8ce292
+	write_extent_buffer(sb, super_copy, 0, sizeof(*super_copy));
8ce292
 	array_size = btrfs_super_sys_array_size(super_copy);
8ce292
 
8ce292
 	/*
8ce292
diff --git a/volumes.h b/volumes.h
8ce292
index bb78751..e466b31 100644
8ce292
--- a/volumes.h
8ce292
+++ b/volumes.h
8ce292
@@ -130,4 +130,5 @@ int btrfs_add_system_chunk(struct btrfs_trans_handle *trans,
8ce292
 			   struct btrfs_root *root, struct btrfs_key *key,
8ce292
 			   struct btrfs_chunk *chunk, int item_size);
8ce292
 int btrfs_chunk_readonly(struct btrfs_root *root, u64 chunk_offset);
8ce292
+void btrfs_mapping_tree_free(struct btrfs_mapping_tree *tree);
8ce292
 #endif