RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: libbtrfs: copy btrfs_uuid_tree_lookup_any from uuid-tree.c 

Copy the lookup helper and switch the API functions using it. We can
drop dependency on kernel-shared/uuid-tree.c after that.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2021-09-22 19:50:47 +02:00
parent 46fa64417c
commit f404f14917
1 changed files with 75 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
libbtrfs/send-utils.c
View File

@ -482,6 +482,77 @@ struct subvol_info *subvol_uuid_search(struct subvol_uuid_search *s,
return si;
}
static void uuid_to_key(const u8 *uuid, struct btrfs_key *key)
{
u64 tmp;
tmp = get_unaligned_le64(uuid);
put_unaligned_64(tmp, &key->objectid);
tmp = get_unaligned_le64(uuid + sizeof(u64));
put_unaligned_64(tmp, &key->offset);
}
/*
* Search uuid tree - mounted
*
* return -ENOENT for !found, < 0 for errors, or 0 if an item was found
*/
static int btrfs_uuid_tree_lookup_any(int fd, const u8 *uuid, u8 type,
u64 *subid)
{
int ret;
struct btrfs_ioctl_search_args search_arg;
struct btrfs_ioctl_search_header *search_header;
u32 item_size;
__le64 lesubid;
struct btrfs_key key;
key.type = type;
uuid_to_key(uuid, &key);
memset(&search_arg, 0, sizeof(search_arg));
search_arg.key.tree_id = BTRFS_UUID_TREE_OBJECTID;
search_arg.key.min_objectid = key.objectid;
search_arg.key.max_objectid = key.objectid;
search_arg.key.min_type = type;
search_arg.key.max_type = type;
search_arg.key.min_offset = key.offset;
search_arg.key.max_offset = key.offset;
search_arg.key.max_transid = (u64)-1;
search_arg.key.nr_items = 1;
ret = ioctl(fd, BTRFS_IOC_TREE_SEARCH, &search_arg);
if (ret < 0) {
fprintf(stderr,
"ioctl(BTRFS_IOC_TREE_SEARCH, uuid, key %016llx, UUID_KEY, %016llx) ret=%d, error: %m\n",
(unsigned long long)key.objectid,
(unsigned long long)key.offset, ret);
ret = -ENOENT;
goto out;
}
if (search_arg.key.nr_items < 1) {
ret = -ENOENT;
goto out;
}
search_header = (struct btrfs_ioctl_search_header *)(search_arg.buf);
item_size = btrfs_search_header_len(search_header);
if ((item_size & (sizeof(u64) - 1)) || item_size == 0) {
printf("btrfs: uuid item with illegal size %lu!\n",
(unsigned long)item_size);
ret = -ENOENT;
goto out;
} else {
ret = 0;
}
/* return first stored id */
memcpy(&lesubid, search_header + 1, sizeof(lesubid));
*subid = le64_to_cpu(lesubid);
out:
return ret;
}
struct subvol_info *subvol_uuid_search2(struct subvol_uuid_search *s,
u64 root_id, const u8 *uuid, u64 transid,
const char *path,
@ -498,11 +569,12 @@ struct subvol_info *subvol_uuid_search2(struct subvol_uuid_search *s,
#endif
switch (type) {
case subvol_search_by_received_uuid:
ret = btrfs_lookup_uuid_received_subvol_item(s->mnt_fd, uuid,
&root_id);
ret = btrfs_uuid_tree_lookup_any(s->mnt_fd, uuid,
BTRFS_UUID_KEY_RECEIVED_SUBVOL, &root_id);
break;
case subvol_search_by_uuid:
ret = btrfs_lookup_uuid_subvol_item(s->mnt_fd, uuid, &root_id);
ret = btrfs_uuid_tree_lookup_any(s->mnt_fd, uuid,
BTRFS_UUID_KEY_SUBVOL, &root_id);
break;
case subvol_search_by_root_id:
break;