btrfs-progs: Remove btrfs-debug-tree command

[platform/upstream/btrfs-progs.git] / chunk-recover.c

diff --git a/chunk-recover.c b/chunk-recover.c
index e33ee8b..705bcf5 100644 (file)
--- a/chunk-recover.c
+++ b/chunk-recover.c
@@ -451,24 +451,6 @@ static void print_device_extent_tree(struct device_extent_tree *tree)
        printf("\n");
 }
 
-static void print_device_info(struct btrfs_device *device, char *prefix)
-{
-       if (prefix)
-               printf("%s", prefix);
-       printf("Device: id = %llu, name = %s\n",
-              device->devid, device->name);
-}
-
-static void print_all_devices(struct list_head *devices)
-{
-       struct btrfs_device *dev;
-
-       printf("All Devices:\n");
-       list_for_each_entry(dev, devices, dev_list)
-               print_device_info(dev, "\t");
-       printf("\n");
-}
-
 static void print_scan_result(struct recover_control *rc)
 {
        if (!rc->verbose)
@@ -942,11 +924,12 @@ static int build_device_map_by_chunk_record(struct btrfs_root *root,
        u64 devid;
        u8 uuid[BTRFS_UUID_SIZE];
        u16 num_stripes;
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_mapping_tree *map_tree;
        struct map_lookup *map;
        struct stripe *stripe;
 
-       map_tree = &root->fs_info->mapping_tree;
+       map_tree = &fs_info->mapping_tree;
        num_stripes = chunk->num_stripes;
        map = malloc(btrfs_map_lookup_size(num_stripes));
        if (!map)
@@ -965,7 +948,7 @@ static int build_device_map_by_chunk_record(struct btrfs_root *root,
                devid = stripe->devid;
                memcpy(uuid, stripe->dev_uuid, BTRFS_UUID_SIZE);
                map->stripes[i].physical = stripe->offset;
-               map->stripes[i].dev = btrfs_find_device(root, devid,
+               map->stripes[i].dev = btrfs_find_device(fs_info, devid,
                                                        uuid, NULL);
                if (!map->stripes[i].dev) {
                        free(map);
@@ -1070,7 +1053,7 @@ again:
                    key.type == BTRFS_METADATA_ITEM_KEY) {
                        old_val = btrfs_super_bytes_used(fs_info->super_copy);
                        if (key.type == BTRFS_METADATA_ITEM_KEY)
-                               old_val += root->nodesize;
+                               old_val += fs_info->nodesize;
                        else
                                old_val += key.offset;
                        btrfs_set_super_bytes_used(fs_info->super_copy,
@@ -1086,7 +1069,7 @@ again:
 
        if (key.objectid < end) {
                if (key.type == BTRFS_BLOCK_GROUP_ITEM_KEY) {
-                       key.objectid += root->sectorsize;
+                       key.objectid += fs_info->sectorsize;
                        key.type = BTRFS_EXTENT_ITEM_KEY;
                        key.offset = 0;
                }
@@ -1115,8 +1098,8 @@ static int block_group_free_all_extent(struct btrfs_root *root,
        end = start + cache->key.offset - 1;
 
        set_extent_bits(&info->block_group_cache, start, end,
-                       BLOCK_GROUP_DIRTY, GFP_NOFS);
-       set_extent_dirty(&info->free_space_cache, start, end, GFP_NOFS);
+                       BLOCK_GROUP_DIRTY);
+       set_extent_dirty(&info->free_space_cache, start, end);
 
        btrfs_set_block_group_used(&cache->item, 0);
 
@@ -1163,7 +1146,7 @@ static int __rebuild_chunk_root(struct btrfs_trans_handle *trans,
        btrfs_set_disk_key_type(&disk_key, BTRFS_DEV_ITEM_KEY);
        btrfs_set_disk_key_offset(&disk_key, min_devid);
 
-       cow = btrfs_alloc_free_block(trans, root, root->nodesize,
+       cow = btrfs_alloc_free_block(trans, root, root->fs_info->nodesize,
                                     BTRFS_CHUNK_TREE_OBJECTID,
                                     &disk_key, 0, 0, 0);
        btrfs_set_header_bytenr(cow, cow->start);
@@ -1286,13 +1269,14 @@ static int rebuild_chunk_tree(struct btrfs_trans_handle *trans,
 static int rebuild_sys_array(struct recover_control *rc,
                             struct btrfs_root *root)
 {
+       struct btrfs_fs_info *fs_info = root->fs_info;
        struct btrfs_chunk *chunk;
        struct btrfs_key key;
        struct chunk_record *chunk_rec;
        int ret = 0;
        u16 num_stripes;
 
-       btrfs_set_super_sys_array_size(root->fs_info->super_copy, 0);
+       btrfs_set_super_sys_array_size(fs_info->super_copy, 0);
 
        list_for_each_entry(chunk_rec, &rc->good_chunks, list) {
                if (!(chunk_rec->type_flags & BTRFS_BLOCK_GROUP_SYSTEM))
@@ -1309,7 +1293,7 @@ static int rebuild_sys_array(struct recover_control *rc,
                key.type = BTRFS_CHUNK_ITEM_KEY;
                key.offset = chunk_rec->offset;
 
-               ret = btrfs_add_system_chunk(NULL, root, &key, chunk,
+               ret = btrfs_add_system_chunk(fs_info, &key, chunk,
                                btrfs_chunk_item_size(num_stripes));
                free(chunk);
                if (ret)
@@ -1340,7 +1324,7 @@ static int calculate_bg_used(struct btrfs_root *extent_root,
                    found_key.type != BTRFS_EXTENT_DATA_KEY)
                        goto next;
                if (found_key.type == BTRFS_METADATA_ITEM_KEY)
-                       used_ret += extent_root->nodesize;
+                       used_ret += extent_root->fs_info->nodesize;
                else
                        used_ret += found_key.offset;
 next:
@@ -1448,10 +1432,6 @@ open_ctree_with_broken_chunk(struct recover_control *rc)
        struct btrfs_fs_info *fs_info;
        struct btrfs_super_block *disk_super;
        struct extent_buffer *eb;
-       u32 sectorsize;
-       u32 nodesize;
-       u32 leafsize;
-       u32 stripesize;
        int ret;
 
        fs_info = btrfs_new_fs_info(1, BTRFS_SUPER_INFO_OFFSET);
@@ -1476,18 +1456,16 @@ open_ctree_with_broken_chunk(struct recover_control *rc)
        }
 
        memcpy(fs_info->fsid, &disk_super->fsid, BTRFS_FSID_SIZE);
+       fs_info->sectorsize = btrfs_super_sectorsize(disk_super);
+       fs_info->nodesize = btrfs_super_nodesize(disk_super);
+       fs_info->stripesize = btrfs_super_stripesize(disk_super);
 
-       ret = btrfs_check_fs_compatibility(disk_super, 1);
+       ret = btrfs_check_fs_compatibility(disk_super, OPEN_CTREE_WRITES);
        if (ret)
                goto out_devices;
 
-       nodesize = btrfs_super_nodesize(disk_super);
-       leafsize = btrfs_super_leafsize(disk_super);
-       sectorsize = btrfs_super_sectorsize(disk_super);
-       stripesize = btrfs_super_stripesize(disk_super);
-
-       btrfs_setup_root(nodesize, leafsize, sectorsize, stripesize,
-                    fs_info->chunk_root, fs_info, BTRFS_CHUNK_TREE_OBJECTID);
+       btrfs_setup_root(fs_info->chunk_root, fs_info,
+                        BTRFS_CHUNK_TREE_OBJECTID);
 
        ret = build_device_maps_by_chunk_records(rc, fs_info->chunk_root);
        if (ret)
@@ -1839,7 +1817,7 @@ static int next_csum(struct btrfs_root *root,
        int ret = 0;
        struct btrfs_root *csum_root = root->fs_info->csum_root;
        struct btrfs_csum_item *csum_item;
-       u32 blocksize = root->sectorsize;
+       u32 blocksize = root->fs_info->sectorsize;
        u16 csum_size = btrfs_super_csum_size(root->fs_info->super_copy);
        int csums_in_item = btrfs_item_size_nr(*leaf, *slot) / csum_size;
 
@@ -1911,7 +1889,7 @@ static int check_one_csum(int fd, u64 start, u32 len, u32 tree_csum)
                goto out;
        }
        ret = 0;
-       csum_result = btrfs_csum_data(NULL, data, csum_result, len);
+       csum_result = btrfs_csum_data(data, csum_result, len);
        btrfs_csum_final(csum_result, (u8 *)&csum_result);
        if (csum_result != tree_csum)
                ret = 1;
@@ -1922,7 +1900,7 @@ out:
 
 static u64 item_end_offset(struct btrfs_root *root, struct btrfs_key *key,
                           struct extent_buffer *leaf, int slot) {
-       u32 blocksize = root->sectorsize;
+       u32 blocksize = root->fs_info->sectorsize;
        u16 csum_size = btrfs_super_csum_size(root->fs_info->super_copy);
 
        u64 offset = btrfs_item_size_nr(leaf, slot);
@@ -2012,7 +1990,7 @@ static int rebuild_raid_data_chunk_stripes(struct recover_control *rc,
        u64 chunk_end = chunk->offset + chunk->length;
        u64 csum_offset = 0;
        u64 data_offset;
-       u32 blocksize = root->sectorsize;
+       u32 blocksize = root->fs_info->sectorsize;
        u32 tree_csum;
        int index = 0;
        int num_unordered = 0;
@@ -2393,6 +2371,7 @@ int btrfs_recover_chunk_tree(char *path, int verbose, int yes)
        }
 
        trans = btrfs_start_transaction(root, 1);
+       BUG_ON(IS_ERR(trans));
        ret = remove_chunk_extent_item(trans, &rc, root);
        BUG_ON(ret);