mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-01 06:45:35 +00:00
Code Issues Releases Wiki Activity

files: Pass pstree_item argument to clone_service_fd()

Browse Source 
Refactoring for next patches.

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Kirill Tkhai
2018-01-10 17:02:27 +03:00
committed by Andrei Vagin
parent 72c1c1a6ab
commit dfb7705df0
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
criu/cr-restore.c
View File

@@ -1035,7 +1035,7 @@ static int restore_one_zombie(CoreEntry *core)
static int setup_newborn_fds(struct pstree_item *me) 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; return -1;
if (!me->parent || if (!me->parent ||

2
criu/include/servicefd.h
View File

@@ -30,7 +30,7 @@ struct pstree_item;
extern bool sfds_protected; extern bool sfds_protected;
extern void set_proc_self_fd(int fd); 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 init_service_fd(void);
extern int get_service_fd(enum sfd_type type); extern int get_service_fd(enum sfd_type type);
extern int install_service_fd(enum sfd_type type, int fd); extern int install_service_fd(enum sfd_type type, int fd);

6
criu/util.c
View File

@@ -542,9 +542,11 @@ int close_service_fd(enum sfd_type type)
return 0; 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) if (service_fd_id == id)
return 0; return 0;