Commit 9daefff5 authored by Andrey Vagin's avatar Andrey Vagin Committed by Pavel Emelyanov

cgroup: call fini_cgroup() on error paths

Currenlty if criu fails before prepare_cgroup_properties(),
cgyard isn't umounted.

I think it's déjà vu, but it isn't :)

commit 28b0e16d
Author: Andrew Vagin <avagin@openvz.org>
Date:   Mon Aug 25 14:29:00 2014 +0400

    cgroup: call fin_cgroup() on error paths

Cc: Tycho Andersen <tycho.andersen@canonical.com>
Cc: Saied Kazemi <saied@google.com>
Signed-off-by: 's avatarAndrey Vagin <avagin@openvz.org>
Acked-by: 's avatarTycho Andersen <tycho.andersen@canonical.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent dd71cca5
...@@ -1850,10 +1850,8 @@ static int restore_root_task(struct pstree_item *init) ...@@ -1850,10 +1850,8 @@ static int restore_root_task(struct pstree_item *init)
write_stats(RESTORE_STATS); write_stats(RESTORE_STATS);
if (!opts.restore_detach && !opts.exec_cmd) { if (!opts.restore_detach && !opts.exec_cmd)
fini_cgroup();
wait(NULL); wait(NULL);
}
return 0; return 0;
...@@ -1875,6 +1873,7 @@ out_kill: ...@@ -1875,6 +1873,7 @@ out_kill:
} }
out: out:
fini_cgroup();
stop_usernsd(); stop_usernsd();
__restore_switch_stage(CR_STATE_FAIL); __restore_switch_stage(CR_STATE_FAIL);
pr_err("Restoring FAILED.\n"); pr_err("Restoring FAILED.\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment