projects
/
platform
/
upstream
/
btrfs-progs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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;
u16 csum_size;
u32 sectorsize;
- u32
leaf
size;
+ u32
node
size;
u64 generation;
u64 chunk_root_generation;
u64 generation;
u64 chunk_root_generation;
@@
-247,7
+247,7
@@
again:
generation);
/*
* According to the current kernel code, the following
generation);
/*
* According to the current kernel code, the following
- * case is impossble, or there is something wrong in
+ * case is imposs
i
ble, or there is something wrong in
* the kernel code.
*/
if (memcmp(((void *)exist) + offset,
* 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("DEVICE SCAN RESULT:\n");
printf("Filesystem Information:\n");
printf("\tsectorsize: %d\n", rc->sectorsize);
- printf("\t
leafsize: %d\n", rc->leaf
size);
+ printf("\t
nodesize: %d\n", rc->node
size);
printf("\ttree root generation: %llu\n", rc->generation);
printf("\tchunk root generation: %llu\n", rc->chunk_root_generation);
printf("\n");
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,
btrfs_dev_extent_chunk_offset(l, dev_extent)) {
if (rc->verbose)
fprintf(stderr,
- "Device tree
un
match with chunks dev_extent[%llu, %llu], chunk[%llu, %llu]\n",
+ "Device tree
mis
match 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),
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,
if (chunk->type_flags != btrfs_disk_block_group_flags(l, bg_ptr)) {
if (rc->verbose)
fprintf(stderr,
- "Chunk[%llu, %llu]'s type(%llu) is differe
m
t with Block Group's type(%llu)\n",
+ "Chunk[%llu, %llu]'s type(%llu) is differe
n
t 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);
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;
if (ret)
return 1;
- buf = malloc(sizeof(*buf) + rc->
leaf
size);
+ buf = malloc(sizeof(*buf) + rc->
node
size);
if (!buf)
return -ENOMEM;
if (!buf)
return -ENOMEM;
- buf->len = rc->
leaf
size;
+ buf->len = rc->
node
size;
bytenr = 0;
while (1) {
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 (is_super_block_address(bytenr))
bytenr += rc->sectorsize;
- if (pread64(fd, buf->data, rc->
leaf
size, bytenr) <
- rc->
leaf
size)
+ if (pread64(fd, buf->data, rc->
node
size, bytenr) <
+ rc->
node
size)
break;
if (memcmp_extent_buffer(buf, rc->fs_devices->fsid,
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:
break;
}
next_node:
- bytenr += rc->
leaf
size;
+ bytenr += rc->
node
size;
}
out:
close(fd);
}
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)
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->
leaf
size;
+ old_val += root->
node
size;
else
old_val += key.offset;
btrfs_set_super_bytes_used(fs_info->super_copy,
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->sectorsize = btrfs_super_sectorsize(sb);
- rc->
leafsize = btrfs_super_leaf
size(sb);
+ rc->
nodesize = btrfs_super_node
size(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);
rc->generation = btrfs_super_generation(sb);
rc->chunk_root_generation = btrfs_super_chunk_root_generation(sb);
rc->csum_size = btrfs_super_csum_size(sb);