btrfs-progs: dump-tree: convert key-to-string to table

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

diff --git a/chunk-recover.c b/chunk-recover.c
index 4ad337b..93d2918 100644 (file)
--- a/chunk-recover.c
+++ b/chunk-recover.c
@@ -247,7 +247,7 @@ again:
                                              generation);
                        /*
                         * According to the current kernel code, the following
-                        * case is impossble, or there is something wrong in
+                        * case is impossible, or there is something wrong in
                         * the kernel code.
                         */
                        if (memcmp(((void *)exist) + offset,
@@ -618,7 +618,7 @@ static int check_chunk_by_metadata(struct recover_control *rc,
                    btrfs_dev_extent_chunk_offset(l, dev_extent)) {
                        if (rc->verbose)
                                fprintf(stderr,
-                                       "Device tree unmatch with chunks dev_extent[%llu, %llu], chunk[%llu, %llu]\n",
+                                       "Device tree mismatch with chunks dev_extent[%llu, %llu], chunk[%llu, %llu]\n",
                                        btrfs_dev_extent_chunk_offset(l,
                                                                dev_extent),
                                        btrfs_dev_extent_length(l, dev_extent),
@@ -654,7 +654,7 @@ bg_check:
        if (chunk->type_flags != btrfs_disk_block_group_flags(l, bg_ptr)) {
                if (rc->verbose)
                        fprintf(stderr,
-                               "Chunk[%llu, %llu]'s type(%llu) is differemt with Block Group's type(%llu)\n",
+                               "Chunk[%llu, %llu]'s type(%llu) is different with Block Group's type(%llu)\n",
                                chunk->offset, chunk->length, chunk->type_flags,
                                btrfs_disk_block_group_flags(l, bg_ptr));
                btrfs_release_path(&path);
@@ -968,7 +968,7 @@ static int build_device_map_by_chunk_record(struct btrfs_root *root,
                map->stripes[i].dev = btrfs_find_device(root, devid,
                                                        uuid, NULL);
                if (!map->stripes[i].dev) {
-                       kfree(map);
+                       free(map);
                        return -EIO;
                }
        }
@@ -1470,7 +1470,8 @@ open_ctree_with_broken_chunk(struct recover_control *rc)
 
        disk_super = fs_info->super_copy;
        ret = btrfs_read_dev_super(fs_info->fs_devices->latest_bdev,
-                                  disk_super, fs_info->super_bytenr, 1);
+                                  disk_super, fs_info->super_bytenr,
+                                  SBREAD_RECOVER);
        if (ret) {
                fprintf(stderr, "No valid btrfs found\n");
                goto out_devices;
@@ -1487,7 +1488,7 @@ open_ctree_with_broken_chunk(struct recover_control *rc)
        sectorsize = btrfs_super_sectorsize(disk_super);
        stripesize = btrfs_super_stripesize(disk_super);
 
-       __setup_root(nodesize, leafsize, sectorsize, stripesize,
+       btrfs_setup_root(nodesize, leafsize, sectorsize, stripesize,
                     fs_info->chunk_root, fs_info, BTRFS_CHUNK_TREE_OBJECTID);
 
        ret = build_device_maps_by_chunk_records(rc, fs_info->chunk_root);
@@ -1531,7 +1532,8 @@ static int recover_prepare(struct recover_control *rc, char *path)
        }
 
        sb = (struct btrfs_super_block*)buf;
-       ret = btrfs_read_dev_super(fd, sb, BTRFS_SUPER_INFO_OFFSET, 1);
+       ret = btrfs_read_dev_super(fd, sb, BTRFS_SUPER_INFO_OFFSET,
+                       SBREAD_RECOVER);
        if (ret) {
                fprintf(stderr, "read super block error\n");
                goto out_close_fd;
@@ -1550,7 +1552,7 @@ static int recover_prepare(struct recover_control *rc, char *path)
                goto out_close_fd;
        }
 
-       ret = btrfs_scan_fs_devices(fd, path, &fs_devices, 0, 1, 0);
+       ret = btrfs_scan_fs_devices(fd, path, &fs_devices, 0, SBREAD_RECOVER, 0);
        if (ret)
                goto out_close_fd;
 
@@ -1912,7 +1914,7 @@ static int check_one_csum(int fd, u64 start, u32 len, u32 tree_csum)
        }
        ret = 0;
        csum_result = btrfs_csum_data(NULL, data, csum_result, len);
-       btrfs_csum_final(csum_result, (char *)&csum_result);
+       btrfs_csum_final(csum_result, (u8 *)&csum_result);
        if (csum_result != tree_csum)
                ret = 1;
 out:
@@ -1945,9 +1947,12 @@ static int insert_stripe(struct list_head *devexts,
        dev = btrfs_find_device_by_devid(rc->fs_devices, devext->objectid,
                                        0);
        if (!dev)
-               return 1;
-       BUG_ON(btrfs_find_device_by_devid(rc->fs_devices, devext->objectid,
-                                       1));
+               return -ENOENT;
+       if (btrfs_find_device_by_devid(rc->fs_devices, devext->objectid, 1)) {
+               error("unexpected: found another device with id %llu",
+                               (unsigned long long)devext->objectid);
+               return -EINVAL;
+       }
 
        chunk->stripes[index].devid = devext->objectid;
        chunk->stripes[index].offset = devext->offset;
@@ -2245,6 +2250,13 @@ static int btrfs_recover_chunks(struct recover_control *rc)
                chunk->sub_stripes = calc_sub_nstripes(bg->flags);
 
                ret = insert_cache_extent(&rc->chunk, &chunk->cache);
+               if (ret == -EEXIST) {
+                       error("duplicate entry in cache start %llu size %llu",
+                                       (unsigned long long)chunk->cache.start,
+                                       (unsigned long long)chunk->cache.size);
+                       free(chunk);
+                       return ret;
+               }
                BUG_ON(ret);
 
                list_del_init(&bg->list);