diff options
author | Chris Mason <chris.mason@fusionio.com> | 2013-02-06 12:51:58 -0500 |
---|---|---|
committer | Chris Mason <chris.mason@fusionio.com> | 2013-02-06 12:51:58 -0500 |
commit | 82ac34581e8fae6ef3f84758361c75f5b30c576d (patch) | |
tree | b7bb32f9e4b4f5989cc148543bf2782abb0a1c93 /find-root.c | |
parent | 7b1c567c84a6292c138db3bd1638e19e73e0e593 (diff) | |
parent | 2986545ccd655273658e0e4463a669bb1893ba68 (diff) |
Merge branch 'cov-fixes-v1-integration-20130201' of http://git.zabbo.net/cgit/btrfs-progs into merged
Diffstat (limited to 'find-root.c')
-rw-r--r-- | find-root.c | 27 |
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; } |