The super_chunk_root_level set/get function defined by
BTRFS_SETGET_STACK_FUNCS macro is missing the prefix stack.
Signed-off-by: Lu Fengqi <lufq.f...@cn.fujitsu.com>
---
btrfs-find-root.c | 2 +-
cmds-inspect-dump-super.c | 2 +-
ctree.h | 2 +-
disk-io.c | 7 ++++---
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/btrfs-find-root.c b/btrfs-find-root.c
index fc8debea..5fddf8b3 100644
--- a/btrfs-find-root.c
+++ b/btrfs-find-root.c
@@ -68,7 +68,7 @@ static void get_root_gen_and_level(u64 objectid, struct
btrfs_fs_info *fs_info,
gen = btrfs_stack_super_generation(super);
break;
case BTRFS_CHUNK_TREE_OBJECTID:
- level = btrfs_super_chunk_root_level(super);
+ level = btrfs_stack_super_chunk_root_level(super);
gen = btrfs_stack_super_chunk_root_generation(super);
break;
case BTRFS_TREE_LOG_OBJECTID:
diff --git a/cmds-inspect-dump-super.c b/cmds-inspect-dump-super.c
index bdc10211..c4bc3621 100644
--- a/cmds-inspect-dump-super.c
+++ b/cmds-inspect-dump-super.c
@@ -382,7 +382,7 @@ static void dump_superblock(struct btrfs_super_block *sb,
int full)
printf("chunk_root\t\t%llu\n",
(unsigned long long)btrfs_stack_super_chunk_root(sb));
printf("chunk_root_level\t%llu\n",
- (unsigned long long)btrfs_super_chunk_root_level(sb));
+ (unsigned long long)btrfs_stack_super_chunk_root_level(sb));
printf("log_root\t\t%llu\n",
(unsigned long long)btrfs_super_log_root(sb));
printf("log_root_transid\t%llu\n",
diff --git a/ctree.h b/ctree.h
index a525f958..e413b76a 100644
--- a/ctree.h
+++ b/ctree.h
@@ -2176,7 +2176,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_super_root_level, struct
btrfs_super_block,
root_level, 8);
BTRFS_SETGET_STACK_FUNCS(stack_super_chunk_root, struct btrfs_super_block,
chunk_root, 64);
-BTRFS_SETGET_STACK_FUNCS(super_chunk_root_level, struct btrfs_super_block,
+BTRFS_SETGET_STACK_FUNCS(stack_super_chunk_root_level, struct
btrfs_super_block,
chunk_root_level, 8);
BTRFS_SETGET_STACK_FUNCS(super_log_root, struct btrfs_super_block,
log_root, 64);
diff --git a/disk-io.c b/disk-io.c
index 56de9bd2..4995c295 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -1313,9 +1313,10 @@ static int check_super(struct btrfs_super_block *sb,
unsigned sbflags)
btrfs_stack_super_root_level(sb), BTRFS_MAX_LEVEL);
goto error_out;
}
- if (btrfs_super_chunk_root_level(sb) >= BTRFS_MAX_LEVEL) {
+ if (btrfs_stack_super_chunk_root_level(sb) >= BTRFS_MAX_LEVEL) {
error("chunk_root level too big: %d >= %d",
- btrfs_super_chunk_root_level(sb), BTRFS_MAX_LEVEL);
+ btrfs_stack_super_chunk_root_level(sb),
+ BTRFS_MAX_LEVEL);
goto error_out;
}
if (btrfs_super_log_root_level(sb) >= BTRFS_MAX_LEVEL) {
@@ -1613,7 +1614,7 @@ int write_ctree_super(struct btrfs_trans_handle *trans,
btrfs_header_level(tree_root->node));
btrfs_set_stack_super_chunk_root(fs_info->super_copy,
chunk_root->node->start);
- btrfs_set_super_chunk_root_level(fs_info->super_copy,
+ btrfs_set_stack_super_chunk_root_level(fs_info->super_copy,
btrfs_header_level(chunk_root->node));
btrfs_set_stack_super_chunk_root_generation(fs_info->super_copy,
btrfs_header_generation(chunk_root->node));
--
2.15.1
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
