Commit 16214d99 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by Andrei Vagin

restore: Rename CR_STATE_POST_RESTORE_NS -> _PREPARE_NAMESPACES

This is wat root task does -- calls prepare_namespace().
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent 5b870266
...@@ -126,7 +126,7 @@ static inline int stage_participants(int next_stage) ...@@ -126,7 +126,7 @@ static inline int stage_participants(int next_stage)
case CR_STATE_FAIL: case CR_STATE_FAIL:
return 0; return 0;
case CR_STATE_ROOT_TASK: case CR_STATE_ROOT_TASK:
case CR_STATE_POST_RESTORE_NS: case CR_STATE_PREPARE_NAMESPACES:
case CR_STATE_RESTORE_SHARED: case CR_STATE_RESTORE_SHARED:
return 1; return 1;
case CR_STATE_FORKING: case CR_STATE_FORKING:
...@@ -1564,7 +1564,7 @@ static int restore_task_with_children(void *_arg) ...@@ -1564,7 +1564,7 @@ static int restore_task_with_children(void *_arg)
if (prepare_namespace(current, ca->clone_flags)) if (prepare_namespace(current, ca->clone_flags))
goto err; goto err;
if (restore_finish_stage(task_entries, CR_STATE_POST_RESTORE_NS) < 0) if (restore_finish_stage(task_entries, CR_STATE_PREPARE_NAMESPACES) < 0)
goto err; goto err;
if (root_prepare_shared()) if (root_prepare_shared())
...@@ -1947,7 +1947,7 @@ static int restore_root_task(struct pstree_item *init) ...@@ -1947,7 +1947,7 @@ static int restore_root_task(struct pstree_item *init)
if (ret) if (ret)
goto out_kill; goto out_kill;
ret = restore_switch_stage(CR_STATE_POST_RESTORE_NS); ret = restore_switch_stage(CR_STATE_PREPARE_NAMESPACES);
if (ret) if (ret)
goto out_kill; goto out_kill;
......
...@@ -206,7 +206,7 @@ enum { ...@@ -206,7 +206,7 @@ enum {
* Need to wait a mount namespace which * Need to wait a mount namespace which
* will be used to clean up remap files. * will be used to clean up remap files.
*/ */
CR_STATE_POST_RESTORE_NS, CR_STATE_PREPARE_NAMESPACES,
CR_STATE_RESTORE_SHARED, CR_STATE_RESTORE_SHARED,
CR_STATE_FORKING, CR_STATE_FORKING,
CR_STATE_RESTORE, CR_STATE_RESTORE,
......
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