@@ -69,7 +69,7 @@ static void get_root_gen_and_level(u64 objectid, struct btrfs_fs_info *fs_info,
break;
case BTRFS_CHUNK_TREE_OBJECTID:
level = btrfs_super_chunk_root_level(super);
- gen = btrfs_super_chunk_root_generation(super);
+ gen = btrfs_stack_super_chunk_root_generation(super);
break;
case BTRFS_TREE_LOG_OBJECTID:
level = btrfs_super_log_root_level(super);
@@ -1536,7 +1536,7 @@ static int recover_prepare(struct recover_control *rc, char *path)
rc->sectorsize = btrfs_super_sectorsize(sb);
rc->nodesize = btrfs_super_nodesize(sb);
rc->generation = btrfs_stack_super_generation(sb);
- rc->chunk_root_generation = btrfs_super_chunk_root_generation(sb);
+ rc->chunk_root_generation = btrfs_stack_super_chunk_root_generation(sb);
rc->csum_size = btrfs_super_csum_size(sb);
/* if seed, the result of scanning below will be partial */
@@ -376,7 +376,7 @@ static void dump_superblock(struct btrfs_super_block *sb, int full)
printf("sys_array_size\t\t%llu\n",
(unsigned long long)btrfs_stack_super_sys_array_size(sb));
printf("chunk_root_generation\t%llu\n",
- (unsigned long long)btrfs_super_chunk_root_generation(sb));
+ (unsigned long long)btrfs_stack_super_chunk_root_generation(sb));
printf("root_level\t\t%llu\n",
(unsigned long long)btrfs_super_root_level(sb));
printf("chunk_root\t\t%llu\n",
@@ -2170,7 +2170,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_super_generation, struct btrfs_super_block,
BTRFS_SETGET_STACK_FUNCS(stack_super_root, struct btrfs_super_block, root, 64);
BTRFS_SETGET_STACK_FUNCS(stack_super_sys_array_size,
struct btrfs_super_block, sys_chunk_array_size, 32);
-BTRFS_SETGET_STACK_FUNCS(super_chunk_root_generation,
+BTRFS_SETGET_STACK_FUNCS(stack_super_chunk_root_generation,
struct btrfs_super_block, chunk_root_generation, 64);
BTRFS_SETGET_STACK_FUNCS(super_root_level, struct btrfs_super_block,
root_level, 8);
@@ -1041,7 +1041,7 @@ int btrfs_setup_chunk_tree_and_device_map(struct btrfs_fs_info *fs_info,
if (ret)
return ret;
- generation = btrfs_super_chunk_root_generation(sb);
+ generation = btrfs_stack_super_chunk_root_generation(sb);
if (chunk_root_bytenr && !IS_ALIGNED(chunk_root_bytenr,
fs_info->sectorsize)) {
@@ -1615,7 +1615,7 @@ int write_ctree_super(struct btrfs_trans_handle *trans,
chunk_root->node->start);
btrfs_set_super_chunk_root_level(fs_info->super_copy,
btrfs_header_level(chunk_root->node));
- btrfs_set_super_chunk_root_generation(fs_info->super_copy,
+ btrfs_set_stack_super_chunk_root_generation(fs_info->super_copy,
btrfs_header_generation(chunk_root->node));
ret = write_all_supers(fs_info);
@@ -171,7 +171,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
btrfs_set_super_nodesize(&super, cfg->nodesize);
btrfs_set_super_stripesize(&super, cfg->stripesize);
btrfs_set_super_csum_type(&super, BTRFS_CSUM_TYPE_CRC32);
- btrfs_set_super_chunk_root_generation(&super, 1);
+ btrfs_set_stack_super_chunk_root_generation(&super, 1);
btrfs_set_super_cache_generation(&super, -1);
btrfs_set_super_incompat_flags(&super, cfg->features);
if (cfg->label)
The super_chunk_root_generation set/get function defined by BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack. Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com> --- btrfs-find-root.c | 2 +- chunk-recover.c | 2 +- cmds-inspect-dump-super.c | 2 +- ctree.h | 2 +- disk-io.c | 4 ++-- mkfs/common.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-)