@@ -1024,7 +1024,7 @@ static int list_subvol_search(int fd, struct root_lookup *root_lookup)
ri = (struct btrfs_root_item *)(args.buf + off);
gen = btrfs_stack_root_generation(ri);
- flags = btrfs_root_flags(ri);
+ flags = btrfs_stack_root_flags(ri);
if(sh.len >
sizeof(struct btrfs_root_item_v0)) {
otime = btrfs_stack_timespec_sec(&ri->otime);
@@ -2058,7 +2058,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_root_level, struct btrfs_root_item, level, 8);
BTRFS_SETGET_STACK_FUNCS(stack_root_dirid, struct btrfs_root_item, root_dirid,
64);
BTRFS_SETGET_STACK_FUNCS(stack_root_refs, struct btrfs_root_item, refs, 32);
-BTRFS_SETGET_STACK_FUNCS(root_flags, struct btrfs_root_item, flags, 64);
+BTRFS_SETGET_STACK_FUNCS(stack_root_flags, struct btrfs_root_item, flags, 64);
BTRFS_SETGET_STACK_FUNCS(root_used, struct btrfs_root_item, bytes_used, 64);
BTRFS_SETGET_STACK_FUNCS(root_limit, struct btrfs_root_item, byte_limit, 64);
BTRFS_SETGET_STACK_FUNCS(root_last_snapshot, struct btrfs_root_item,
@@ -585,7 +585,7 @@ static void print_root_item(struct extent_buffer *leaf, int slot)
memset(&root_item, 0, sizeof(root_item));
read_extent_buffer(leaf, &root_item, (unsigned long)ri, len);
- root_flags_to_str(btrfs_root_flags(&root_item), flags_str);
+ root_flags_to_str(btrfs_stack_root_flags(&root_item), flags_str);
printf("\t\tgeneration %llu root_dirid %llu bytenr %llu level %hhu refs %u\n",
(unsigned long long)btrfs_stack_root_generation(&root_item),
@@ -597,7 +597,7 @@ static void print_root_item(struct extent_buffer *leaf, int slot)
(unsigned long long)btrfs_root_last_snapshot(&root_item),
(unsigned long long)btrfs_root_limit(&root_item),
(unsigned long long)btrfs_root_used(&root_item),
- (unsigned long long)btrfs_root_flags(&root_item),
+ (unsigned long long)btrfs_stack_root_flags(&root_item),
flags_str);
if (root_item.generation == root_item.generation_v2) {
The root_flags 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-list.c | 2 +- ctree.h | 2 +- print-tree.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)