@@ -2067,7 +2067,7 @@ BTRFS_SETGET_STACK_FUNCS(stack_root_last_snapshot, struct btrfs_root_item,
last_snapshot, 64);
BTRFS_SETGET_STACK_FUNCS(stack_root_generation_v2, struct btrfs_root_item,
generation_v2, 64);
-BTRFS_SETGET_STACK_FUNCS(root_ctransid, struct btrfs_root_item,
+BTRFS_SETGET_STACK_FUNCS(stack_root_ctransid, struct btrfs_root_item,
ctransid, 64);
BTRFS_SETGET_STACK_FUNCS(root_otransid, struct btrfs_root_item,
otransid, 64);
@@ -613,7 +613,7 @@ static void print_root_item(struct extent_buffer *leaf, int slot)
}
if (root_item.ctransid) {
printf("\t\tctransid %llu otransid %llu stransid %llu rtransid %llu\n",
- btrfs_root_ctransid(&root_item),
+ btrfs_stack_root_ctransid(&root_item),
btrfs_root_otransid(&root_item),
btrfs_root_stransid(&root_item),
btrfs_root_rtransid(&root_item));
@@ -496,7 +496,7 @@ struct subvol_info *subvol_uuid_search2(struct subvol_uuid_search *s,
memcpy(info->uuid, root_item.uuid, BTRFS_UUID_SIZE);
memcpy(info->received_uuid, root_item.received_uuid, BTRFS_UUID_SIZE);
memcpy(info->parent_uuid, root_item.parent_uuid, BTRFS_UUID_SIZE);
- info->ctransid = btrfs_root_ctransid(&root_item);
+ info->ctransid = btrfs_stack_root_ctransid(&root_item);
info->otransid = btrfs_root_otransid(&root_item);
info->stransid = btrfs_root_stransid(&root_item);
info->rtransid = btrfs_root_rtransid(&root_item);
@@ -672,7 +672,8 @@ int subvol_uuid_search_init(int mnt_fd, struct subvol_uuid_search *s)
memcpy(si->received_uuid,
root_item.received_uuid,
BTRFS_UUID_SIZE);
- si->ctransid = btrfs_root_ctransid(&root_item);
+ si->ctransid = btrfs_stack_root_ctransid(
+ &root_item);
si->otransid = btrfs_root_otransid(&root_item);
si->stransid = btrfs_root_stransid(&root_item);
si->rtransid = btrfs_root_rtransid(&root_item);
The root_ctransid 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(-)