Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-01-23 02:14:37 +00:00
Code Issues Projects Releases Wiki Activity

mount-v2: split out restore_one_sharing helper

Browse source 
This helper restores master_id and shared_id of first mount in the
sharing group. It first copies sharing from either external source or
internal parent sharing group and makes master_id from shared_id. Next
it creates new shared_id when needed.

All other mounts except first are just copied from the first one.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
This commit is contained in:
Pavel Tikhomirov 2022-05-18 18:25:43 +03:00 • committed by Andrei Vagin
parent a90a1d4827
commit f8c9e07e4f
1 changed files with 35 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

60
criu/mount-v2.c
View file

@ -925,27 +925,25 @@ static int move_mount_set_group(int src_id, char *source, int dst_id)
return 0;
}
static int restore_one_sharing_group(struct sharing_group *sg)
static int restore_one_sharing(struct sharing_group *sg, struct mount_info *target)
{
struct mount_info *first, *other;
char first_path[PATH_MAX];
int first_fd;
char target_path[PATH_MAX];
int target_fd;
first = get_first_mount(sg);
first_fd = fdstore_get(first->mnt_fd_id);
BUG_ON(first_fd < 0);
snprintf(first_path, sizeof(first_path), "/proc/self/fd/%d", first_fd);
target_fd = fdstore_get(target->mnt_fd_id);
BUG_ON(target_fd < 0);
snprintf(target_path, sizeof(target_path), "/proc/self/fd/%d", target_fd);
/* Restore first's master_id from shared_id of the source */
/* Restore target's master_id from shared_id of the source */
if (sg->master_id) {
if (sg->parent) {
struct mount_info *p;
struct mount_info *first;
/* Get shared_id from parent sharing group */
p = get_first_mount(sg->parent);
if (move_mount_set_group(p->mnt_fd_id, NULL, first->mnt_fd_id)) {
pr_err("Failed to copy sharing from %d to %d\n", p->mnt_id, first->mnt_id);
close(first_fd);
first = get_first_mount(sg->parent);
if (move_mount_set_group(first->mnt_fd_id, NULL, target->mnt_fd_id)) {
pr_err("Failed to copy sharing from %d to %d\n", first->mnt_id, target->mnt_id);
close(target_fd);
return -1;
}
} else {
@ -956,30 +954,42 @@ static int restore_one_sharing_group(struct sharing_group *sg)
* or non-shared slave). If source is a private mount
* we would fail.
*/
if (move_mount_set_group(-1, sg->source, first->mnt_fd_id)) {
pr_err("Failed to copy sharing from source %s to %d\n", sg->source, first->mnt_id);
close(first_fd);
if (move_mount_set_group(-1, sg->source, target->mnt_fd_id)) {
pr_err("Failed to copy sharing from source %s to %d\n", sg->source, target->mnt_id);
close(target_fd);
return -1;
}
}
/* Convert shared_id to master_id */
if (mount(NULL, first_path, NULL, MS_SLAVE, NULL)) {
pr_perror("Failed to make mount %d slave", first->mnt_id);
close(first_fd);
if (mount(NULL, target_path, NULL, MS_SLAVE, NULL)) {
pr_perror("Failed to make mount %d slave", target->mnt_id);
close(target_fd);
return -1;
}
}
/* Restore first's shared_id */
/* Restore target's shared_id */
if (sg->shared_id) {
if (mount(NULL, first_path, NULL, MS_SHARED, NULL)) {
pr_perror("Failed to make mount %d shared", first->mnt_id);
close(first_fd);
if (mount(NULL, target_path, NULL, MS_SHARED, NULL)) {
pr_perror("Failed to make mount %d shared", target->mnt_id);
close(target_fd);
return -1;
}
}
close(first_fd);
close(target_fd);
return 0;
}
static int restore_one_sharing_group(struct sharing_group *sg)
{
struct mount_info *first, *other;
first = get_first_mount(sg);
if (restore_one_sharing(sg, first))
return -1;
/* Restore sharing for other mounts from the sharing group */
list_for_each_entry(other, &sg->mnt_list, mnt_sharing) {