RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-04-06 17:21:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: open code subvol_uuid_search_init

Browse Source 
The helper is trivial after removing the uuid search fallback code,
open code it.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2021-09-30 20:00:27 +02:00
parent f18dbe2bc6
commit 22f5600649
4 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmds/receive.c
View File

@ -1109,10 +1109,7 @@ static int do_receive(struct btrfs_receive *rctx, const char *tomnt,
rctx->dest_dir_path++; rctx->dest_dir_path++;
} }
ret = subvol_uuid_search_init(rctx->mnt_fd, &rctx->sus); rctx->sus.mnt_fd = rctx->mnt_fd;
if (ret < 0)
goto out;
while (!end) { while (!end) {
ret = btrfs_read_and_process_send_stream(r_fd, &send_ops, ret = btrfs_read_and_process_send_stream(r_fd, &send_ops,
rctx, rctx,

2
cmds/send.c
View File

@ -348,7 +348,7 @@ static int init_root_path(struct btrfs_send *sctx, const char *subvol)
goto out; goto out;
} }
ret = subvol_uuid_search_init(sctx->mnt_fd, &sctx->sus); sctx->sus.mnt_fd = sctx->mnt_fd;
if (ret < 0) { if (ret < 0) {
errno = -ret; errno = -ret;
error("failed to initialize subvol search: %m"); error("failed to initialize subvol search: %m");

7
common/send-utils.c
View File

@ -369,10 +369,3 @@ out:
return info; return info;
} }
int subvol_uuid_search_init(int mnt_fd, struct subvol_uuid_search *s)
{
s->mnt_fd = mnt_fd;
return 0;
}

1
common/send-utils.h
View File

@ -47,7 +47,6 @@ struct subvol_uuid_search {
int mnt_fd; int mnt_fd;
}; };
int subvol_uuid_search_init(int mnt_fd, struct subvol_uuid_search *s);
/* /*
* Search for a subvolume by given type (received uuid, root id, path), returns * Search for a subvolume by given type (received uuid, root id, path), returns
* pointer to newly allocated struct subvol_info or NULL in case it's not found * pointer to newly allocated struct subvol_info or NULL in case it's not found