[CRIU] [PATCH] restore: remove an unused label
Andrey Vagin
avagin at openvz.org
Tue Nov 17 03:47:54 PST 2015
From: Andrew Vagin <avagin at virtuozzo.com>
Signed-off-by: Andrew Vagin <avagin at virtuozzo.com>
---
cr-restore.c | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/cr-restore.c b/cr-restore.c
index 9017dd8..4948eb1 100644
--- a/cr-restore.c
+++ b/cr-restore.c
@@ -1519,26 +1519,26 @@ static int restore_task_with_children(void *_arg)
* Thus -- mount proc at custom location for any new namespace
*/
if (mount_proc())
- goto err_fini_mnt;
+ goto err;
if (prepare_namespace(current, ca->clone_flags))
- goto err_fini_mnt;
+ goto err;
if (root_prepare_shared())
- goto err_fini_mnt;
+ goto err;
if (restore_finish_stage(CR_STATE_RESTORE_SHARED) < 0)
- goto err_fini_mnt;
+ goto err;
} else if (!(ca->clone_flags & CLONE_FILES)) {
if (close_old_fds())
- goto err_fini_mnt;
+ goto err;
}
if (restore_task_mnt_ns(current))
- goto err_fini_mnt;
+ goto err;
if (prepare_mappings())
- goto err_fini_mnt;
+ goto err;
/*
* Call this _before_ forking to optimize cgroups
@@ -1547,10 +1547,10 @@ static int restore_task_with_children(void *_arg)
* just have it inherited.
*/
if (prepare_task_cgroup(current) < 0)
- goto err_fini_mnt;
+ goto err;
if (prepare_sigactions() < 0)
- goto err_fini_mnt;
+ goto err;
if (fault_injected(FI_RESTORE_ROOT_ONLY)) {
pr_info("fault: Restore root task failure!\n");
@@ -1558,16 +1558,16 @@ static int restore_task_with_children(void *_arg)
}
if (create_children_and_session())
- goto err_fini_mnt;
+ goto err;
if (unmap_guard_pages())
- goto err_fini_mnt;
+ goto err;
restore_pgid();
if (restore_finish_stage(CR_STATE_FORKING) < 0)
- goto err_fini_mnt;
+ goto err;
if (current->parent == NULL) {
if (depopulate_roots_yard())
@@ -1581,7 +1581,6 @@ static int restore_task_with_children(void *_arg)
return 0;
-err_fini_mnt:
err:
if (current->parent == NULL)
futex_abort_and_wake(&task_entries->nr_in_progress);
--
2.4.3
More information about the CRIU
mailing list