[v4,25/41] fdstore: Init fdstore earlier

Submitted by Kirill Tkhai on May 4, 2017, 4:09 p.m.

Details

Message ID 149391415745.11711.7777781959614780960.stgit@localhost.localdomain
State New
Series "Nested pid namespaces support"
Headers show

Commit Message

Kirill Tkhai May 4, 2017, 4:09 p.m.
Do that before creation of usernsd. This allows to get fdstore
files from usernsd.

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
 criu/cr-restore.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 9ff4e6ae8..b760ba301 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1554,8 +1554,6 @@  static int restore_task_with_children(void *_arg)
 		if (prepare_shared_tty())
 			goto err;
 
-		if (fdstore_init())
-			goto err;
 		if (join_namespaces()) {
 			pr_perror("Join namespaces failed");
 			goto err;
@@ -1919,6 +1917,9 @@  static int restore_root_task(struct pstree_item *init)
 	if (prepare_userns_hook())
 		return -1;
 
+	if (fdstore_init())
+		return -1;
+
 	if (prepare_namespace_before_tasks())
 		return -1;