Merge branch 'cov-fixes-v1-integration-20130201' of http://git.zabbo.net/cgit/btrfs-progs into merged

1 files changed, 1 insertions, 26 deletions

diff --git a/find-root.c b/find-root.c
index 3d713235..20ff9721 100644
--- a/find-root.c
+++ b/find-root.c
@@ -65,32 +65,6 @@ int csum_block(void *buf, u32 len)
 	return ret;
 }
 
-static int __setup_root(u32 nodesize, u32 leafsize, u32 sectorsize,
-			u32 stripesize, struct btrfs_root *root,
-			struct btrfs_fs_info *fs_info, u64 objectid)
-{
-	root->node = NULL;
-	root->commit_root = NULL;
-	root->sectorsize = sectorsize;
-	root->nodesize = nodesize;
-	root->leafsize = leafsize;
-	root->stripesize = stripesize;
-	root->ref_cows = 0;
-	root->track_dirty = 0;
-
-	root->fs_info = fs_info;
-	root->objectid = objectid;
-	root->last_trans = 0;
-	root->highest_inode = 0;
-	root->last_inode_alloc = 0;
-
-	INIT_LIST_HEAD(&root->dirty_list);
-	memset(&root->root_key, 0, sizeof(root->root_key));
-	memset(&root->root_item, 0, sizeof(root->root_item));
-	root->root_key.objectid = objectid;
-	return 0;
-}
-
 static int close_all_devices(struct btrfs_fs_info *fs_info)
 {
 	struct list_head *list;
@@ -386,6 +360,7 @@ static int find_root(struct btrfs_root *root)
 
 		if (!(type & BTRFS_BLOCK_GROUP_METADATA)) {
 			offset += map_length;
+			kfree(multi);
 			continue;
 		}