[v4,13/19] files: Pass pstree_item argument to clone_service_fd()

Submitted by Kirill Tkhai on Jan. 10, 2018, 2:02 p.m.

Details

Message ID 151559294759.31108.5261141744449232029.stgit@localhost.localdomain
State Accepted
Series "Introduce custom per-task service fds placement"
Commit d300d172a7b9eb051783cdd0b803f64ed507cf07
Headers show

Commit Message

Kirill Tkhai Jan. 10, 2018, 2:02 p.m.
Refactoring for next patches.

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
 criu/cr-restore.c        |    2 +-
 criu/include/servicefd.h |    2 +-
 criu/util.c              |    6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

Patch hide | download patch | download mbox

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 86c923cf2..426910f2f 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -1189,7 +1189,7 @@  static int restore_one_zombie(CoreEntry *core)
 
 static int setup_newborn_fds(struct pstree_item *me)
 {
-	if (clone_service_fd(rsti(me)->service_fd_id))
+	if (clone_service_fd(me))
 		return -1;
 
 	if (!me->parent ||
diff --git a/criu/include/servicefd.h b/criu/include/servicefd.h
index 812396310..25cb68bdd 100644
--- a/criu/include/servicefd.h
+++ b/criu/include/servicefd.h
@@ -30,7 +30,7 @@  struct pstree_item;
 extern bool sfds_protected;
 
 extern void set_proc_self_fd(int fd);
-extern int clone_service_fd(int id);
+extern int clone_service_fd(struct pstree_item *me);
 extern int init_service_fd(void);
 extern int get_service_fd(enum sfd_type type);
 extern int install_service_fd(enum sfd_type type, int fd);
diff --git a/criu/util.c b/criu/util.c
index 3a870a2b1..ef1f11607 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -537,9 +537,11 @@  int close_service_fd(enum sfd_type type)
 	return 0;
 }
 
-int clone_service_fd(int id)
+int clone_service_fd(struct pstree_item *me)
 {
-	int ret = -1, i;
+	int id, i, ret = -1;
+
+	id = rsti(me)->service_fd_id;
 
 	if (service_fd_id == id)
 		return 0;