@@ -2071,7 +2071,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_root_ctransid, struct btrfs_root_item,
ctransid, 64);
BTRFS_SETGET_STACK_FUNCS(stack_root_otransid, struct btrfs_root_item,
otransid, 64);
-BTRFS_SETGET_STACK_FUNCS(root_stransid, struct btrfs_root_item,
+BTRFS_SETGET_STACK_FUNCS(stack_root_stransid, struct btrfs_root_item,
stransid, 64);
BTRFS_SETGET_STACK_FUNCS(root_rtransid, struct btrfs_root_item,
rtransid, 64);
@@ -615,7 +615,7 @@ static void print_root_item(struct extent_buffer *leaf, int slot)
printf("\t\tctransid %llu otransid %llu stransid %llu rtransid %llu\n",
btrfs_stack_root_ctransid(&root_item),
btrfs_stack_root_otransid(&root_item),
- btrfs_root_stransid(&root_item),
+ btrfs_stack_root_stransid(&root_item),
btrfs_root_rtransid(&root_item));
}
if (btrfs_timespec_sec(leaf, btrfs_root_ctime(ri)))
@@ -498,7 +498,7 @@ struct subvol_info *subvol_uuid_search2(struct subvol_uuid_search *s,
memcpy(info->parent_uuid, root_item.parent_uuid, BTRFS_UUID_SIZE);
info->ctransid = btrfs_stack_root_ctransid(&root_item);
info->otransid = btrfs_stack_root_otransid(&root_item);
- info->stransid = btrfs_root_stransid(&root_item);
+ info->stransid = btrfs_stack_root_stransid(&root_item);
info->rtransid = btrfs_root_rtransid(&root_item);
if (type == subvol_search_by_path) {
info->path = strdup(path);
@@ -676,7 +676,8 @@ int subvol_uuid_search_init(int mnt_fd, struct subvol_uuid_search *s)
&root_item);
si->otransid = btrfs_stack_root_otransid(
&root_item);
- si->stransid = btrfs_root_stransid(&root_item);
+ si->stransid = btrfs_stack_root_stransid(
+ &root_item);
si->rtransid = btrfs_root_rtransid(&root_item);
si->path = path;
subvol_uuid_search_add(s, si);
The root_stransid 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> --- ctree.h | 2 +- print-tree.c | 2 +- send-utils.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-)