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

namespaces: add helpers to switch/restore mnt ns

Browse source 
When restoring mnt, we should restore current work directory.

Signed-off-by: Liu Hua <weldonliu@tencent.com>
This commit is contained in:
Liu Hua 2021-09-02 11:10:41 +08:00 • committed by Andrei Vagin
parent 41f4489682
commit eea63587e6
2 changed files with 47 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
criu/include/namespaces.h
View file

@ -165,8 +165,10 @@ extern int prepare_namespace(struct pstree_item *item, unsigned long clone_flags
extern int prepare_userns_creds(void);
extern int switch_ns(int pid, struct ns_desc *nd, int *rst);
extern int switch_mnt_ns(int pid, int *rst, int *cwd_fd);
extern int switch_ns_by_fd(int nsfd, struct ns_desc *nd, int *rst);
extern int restore_ns(int rst, struct ns_desc *nd);
extern int restore_mnt_ns(int rst, int *cwd_fd);
extern int dump_task_ns_ids(struct pstree_item *);
extern int predump_task_ns_ids(struct pstree_item *);

45
criu/namespaces.c
View file

@ -282,6 +282,51 @@ int restore_ns(int rst, struct ns_desc *nd)
return ret;
}
int switch_mnt_ns(int pid, int *rst, int *cwd_fd)
{
int ret;
int fd;
if (!cwd_fd)
return switch_ns(pid, &mnt_ns_desc, rst);
fd = open(".", O_PATH);
if (fd < 0) {
pr_perror("unable to open current directory");
return fd;
}
ret = switch_ns(pid, &mnt_ns_desc, rst);
if (ret < 0) {
close(fd);
return ret;
}
*cwd_fd = fd;
return 0;
}
int restore_mnt_ns(int rst, int *cwd_fd)
{
int ret = -1;
ret = restore_ns(rst, &mnt_ns_desc);
if (ret < 0)
goto err_restore;
if (cwd_fd) {
ret = fchdir(*cwd_fd);
if (ret)
pr_perror("unable to restore current directory");
}
err_restore:
if (cwd_fd)
close_safe(cwd_fd);
return ret;
}
struct ns_id *ns_ids = NULL;
static unsigned int ns_next_id = 1;
unsigned long root_ns_mask = 0;