@@ -1158,7 +1158,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 ||
@@ -29,7 +29,7 @@ enum sfd_type {
struct pstree_item;
-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);
@@ -521,9 +521,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;
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(-)