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

namespaces: cleanup switch_mnt_ns and restore_mnt_ns

Browse source 
Simplify code a bit: make exit codes of those functions more
transparent, rename ret to exit_code.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
This commit is contained in:
Pavel Tikhomirov 2023-01-16 19:13:44 +03:00 • committed by Andrei Vagin
parent 6cbeaeb899
commit 4837343200
1 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
criu/namespaces.c
View file

@ -284,7 +284,6 @@ int restore_ns(int rst, struct ns_desc *nd)
int switch_mnt_ns(int pid, int *rst, int *cwd_fd)
{
int ret;
int fd;
if (!cwd_fd)
@ -293,13 +292,12 @@ int switch_mnt_ns(int pid, int *rst, int *cwd_fd)
fd = open(".", O_PATH);
if (fd < 0) {
pr_perror("unable to open current directory");
return fd;
return -1;
}
ret = switch_ns(pid, &mnt_ns_desc, rst);
if (ret < 0) {
if (switch_ns(pid, &mnt_ns_desc, rst)) {
close(fd);
return ret;
return -1;
}
*cwd_fd = fd;
@ -308,23 +306,22 @@ int switch_mnt_ns(int pid, int *rst, int *cwd_fd)
int restore_mnt_ns(int rst, int *cwd_fd)
{
int ret = -1;
int exit_code = -1;
ret = restore_ns(rst, &mnt_ns_desc);
if (ret < 0)
if (restore_ns(rst, &mnt_ns_desc))
goto err_restore;
if (cwd_fd) {
ret = fchdir(*cwd_fd);
if (ret)
pr_perror("unable to restore current directory");
if (cwd_fd && fchdir(*cwd_fd)) {
pr_perror("Unable to restore current directory");
goto err_restore;
}
exit_code = 0;
err_restore:
if (cwd_fd)
close_safe(cwd_fd);
return ret;
return exit_code;
}
struct ns_id *ns_ids = NULL;