Commit dfb7705d authored by Kirill Tkhai's avatar Kirill Tkhai Committed by Andrei Vagin

files: Pass pstree_item argument to clone_service_fd()

Refactoring for next patches.
Signed-off-by: 's avatarKirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent 72c1c1a6
...@@ -1035,7 +1035,7 @@ static int restore_one_zombie(CoreEntry *core) ...@@ -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 ||
......
...@@ -30,7 +30,7 @@ struct pstree_item; ...@@ -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);
......
...@@ -542,9 +542,11 @@ int close_service_fd(enum sfd_type type) ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment