btrfs-progs: check: introduce traversal function for fsck

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

diff --git a/chunk-recover.c b/chunk-recover.c
index b03330b..085e9a2 100644 (file)
--- a/chunk-recover.c
+++ b/chunk-recover.c
@@ -47,7 +47,7 @@ struct recover_control {
 
        u16 csum_size;
        u32 sectorsize;
-       u32 leafsize;
+       u32 nodesize;
        u64 generation;
        u64 chunk_root_generation;
 
@@ -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,
@@ -477,7 +477,7 @@ static void print_scan_result(struct recover_control *rc)
        printf("DEVICE SCAN RESULT:\n");
        printf("Filesystem Information:\n");
        printf("\tsectorsize: %d\n", rc->sectorsize);
-       printf("\tleafsize: %d\n", rc->leafsize);
+       printf("\tnodesize: %d\n", rc->nodesize);
        printf("\ttree root generation: %llu\n", rc->generation);
        printf("\tchunk root generation: %llu\n", rc->chunk_root_generation);
        printf("\n");
@@ -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);
@@ -761,10 +761,10 @@ static int scan_one_device(void *dev_scan_struct)
        if (ret)
                return 1;
 
-       buf = malloc(sizeof(*buf) + rc->leafsize);
+       buf = malloc(sizeof(*buf) + rc->nodesize);
        if (!buf)
                return -ENOMEM;
-       buf->len = rc->leafsize;
+       buf->len = rc->nodesize;
 
        bytenr = 0;
        while (1) {
@@ -773,8 +773,8 @@ static int scan_one_device(void *dev_scan_struct)
                if (is_super_block_address(bytenr))
                        bytenr += rc->sectorsize;
 
-               if (pread64(fd, buf->data, rc->leafsize, bytenr) <
-                   rc->leafsize)
+               if (pread64(fd, buf->data, rc->nodesize, bytenr) <
+                   rc->nodesize)
                        break;
 
                if (memcmp_extent_buffer(buf, rc->fs_devices->fsid,
@@ -818,7 +818,7 @@ static int scan_one_device(void *dev_scan_struct)
                        break;
                }
 next_node:
-               bytenr += rc->leafsize;
+               bytenr += rc->nodesize;
        }
 out:
        close(fd);
@@ -1070,7 +1070,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->leafsize;
+                               old_val += root->nodesize;
                        else
                                old_val += key.offset;
                        btrfs_set_super_bytes_used(fs_info->super_copy,
@@ -1538,7 +1538,7 @@ static int recover_prepare(struct recover_control *rc, char *path)
        }
 
        rc->sectorsize = btrfs_super_sectorsize(sb);
-       rc->leafsize = btrfs_super_leafsize(sb);
+       rc->nodesize = btrfs_super_nodesize(sb);
        rc->generation = btrfs_super_generation(sb);
        rc->chunk_root_generation = btrfs_super_chunk_root_generation(sb);
        rc->csum_size = btrfs_super_csum_size(sb);