diff --git a/cmds/subvolume-list.c b/cmds/subvolume-list.c index 21319267e2..f16b591a06 100644 --- a/cmds/subvolume-list.c +++ b/cmds/subvolume-list.c @@ -769,7 +769,7 @@ static int resolve_root(struct rb_root *rl, struct root_info *ri, */ static int lookup_ino_path(int fd, struct root_info *ri) { - struct btrfs_ioctl_ino_lookup_args args; + struct btrfs_ioctl_ino_lookup_user_args args; int ret; if (ri->path) @@ -780,9 +780,9 @@ static int lookup_ino_path(int fd, struct root_info *ri) memset(&args, 0, sizeof(args)); args.treeid = ri->ref_tree; - args.objectid = ri->dir_id; + args.dirid = ri->dir_id; - ret = ioctl(fd, BTRFS_IOC_INO_LOOKUP, &args); + ret = ioctl(fd, BTRFS_IOC_INO_LOOKUP_USER, &args); if (ret < 0) { if (errno == ENOENT) { ri->ref_tree = 0; @@ -792,6 +792,12 @@ static int lookup_ino_path(int fd, struct root_info *ri) return ret; } + ri->path = malloc(strlen(args.name) + strlen(args.path) + 1); + if (!ri->path) { + error_msg(ERROR_MSG_MEMORY, NULL); + exit(1); + } + if (args.name[0]) { /* * we're in a subdirectory of ref_tree, the kernel ioctl