[CRIU] [PATCH v2 24/36] proc: Close CR_PROC_FD_OFF and TRANSPORT_FD_OFF later

Kirill Tkhai ktkhai at virtuozzo.com
Fri Feb 3 08:15:09 PST 2017


CR_PROC_FD_OFF is need for accessing to foreign tasks
fds, and will be used in the future.

TRANSPORT_FD_OFF is for uniformity.

Signed-off-by: Kirill Tkhai <ktkhai at virtuozzo.com>
---
 criu/cr-restore.c |    2 ++
 criu/files.c      |    1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 63c6147c9..f175b417f 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -3198,6 +3198,8 @@ static int sigreturn_restore(pid_t pid, struct task_restore_args *task_args, uns
 
 	close_image_dir();
 	close_proc();
+	close_service_fd(TRANSPORT_FD_OFF);
+	close_service_fd(CR_PROC_FD_OFF);
 	close_service_fd(ROOT_FD_OFF);
 	close_service_fd(USERNSD_SK);
 
diff --git a/criu/files.c b/criu/files.c
index 1a76313b2..687fb166f 100644
--- a/criu/files.c
+++ b/criu/files.c
@@ -1184,7 +1184,6 @@ int prepare_fds(struct pstree_item *me)
 	if (rsti(me)->fdt)
 		futex_inc_and_wake(&rsti(me)->fdt->fdt_lock);
 out:
-	close_service_fd(CR_PROC_FD_OFF);
 	tty_fini_fds();
 	return ret;
 }



More information about the CRIU mailing list