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

autofs: restore current work directory after restoring mnt ns

Browse source 
Else criu would change cwd while dumping autofs mounts.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
This commit is contained in:
Pavel Tikhomirov 2021-08-24 14:03:08 +03:00 • committed by Andrei Vagin
parent 45409c35d6
commit 776f3cff7c
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
criu/autofs.c
View file

@ -391,7 +391,7 @@ static int access_autofs_mount(struct mount_info *pm)
const char *mnt_path = pm->mountpoint + 1;
dev_t dev_id = pm->s_dev;
int new_pid_ns = -1, old_pid_ns = -1;
int old_mnt_ns;
int old_mnt_ns, old_cwd_fd;
int autofs_mnt;
int err = -1;
int pid, status;
@ -409,7 +409,7 @@ static int access_autofs_mount(struct mount_info *pm)
if (old_pid_ns < 0)
goto close_new_pid_ns;
if (switch_ns(pm->nsid->ns_pid, &mnt_ns_desc, &old_mnt_ns)) {
if (switch_mnt_ns(pm->nsid->ns_pid, &old_mnt_ns, &old_cwd_fd)) {
pr_err("failed to switch to mount namespace\n");
goto close_old_pid_ns;
}
@ -451,7 +451,7 @@ restore_pid_ns:
}
old_pid_ns = -1;
restore_mnt_ns:
if (restore_ns(old_mnt_ns, &mnt_ns_desc)) {
if (restore_mnt_ns(old_mnt_ns, &old_cwd_fd)) {
pr_err("failed to restore mount namespace\n");
err = -1;
}