Commit 6072bca6 authored by Kirill Tkhai's avatar Kirill Tkhai Committed by Pavel Emelyanov

files: Kill pid parameter of open_fdinfos()

Nobody uses pid, so let's kill it. Also, pass pstree_item parameter
to open_fdinfos() instead of list, as this function operates on fds
list only.

v4: New
Signed-off-by: 's avatarKirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent 2a93e371
...@@ -853,7 +853,7 @@ struct fd_open_state { ...@@ -853,7 +853,7 @@ struct fd_open_state {
int (*cb)(int, struct fdinfo_list_entry *); int (*cb)(int, struct fdinfo_list_entry *);
}; };
static int receive_fd(int pid, struct fdinfo_list_entry *fle); static int receive_fd(struct fdinfo_list_entry *fle);
static void transport_name_gen(struct sockaddr_un *addr, int *len, int pid) static void transport_name_gen(struct sockaddr_un *addr, int *len, int pid)
{ {
...@@ -1007,7 +1007,7 @@ static int setup_and_serve_out(struct fdinfo_list_entry *fle, int new_fd) ...@@ -1007,7 +1007,7 @@ static int setup_and_serve_out(struct fdinfo_list_entry *fle, int new_fd)
return 0; return 0;
} }
static int open_fd(int pid, struct fdinfo_list_entry *fle) static int open_fd(struct fdinfo_list_entry *fle)
{ {
struct file_desc *d = fle->desc; struct file_desc *d = fle->desc;
struct fdinfo_list_entry *flem; struct fdinfo_list_entry *flem;
...@@ -1016,7 +1016,7 @@ static int open_fd(int pid, struct fdinfo_list_entry *fle) ...@@ -1016,7 +1016,7 @@ static int open_fd(int pid, struct fdinfo_list_entry *fle)
flem = file_master(d); flem = file_master(d);
if (fle != flem) { if (fle != flem) {
BUG_ON (fle->stage != FLE_INITIALIZED); BUG_ON (fle->stage != FLE_INITIALIZED);
ret = receive_fd(pid, fle); ret = receive_fd(fle);
if (ret != 0) if (ret != 0)
return ret; return ret;
goto fixup_ctty; goto fixup_ctty;
...@@ -1053,7 +1053,7 @@ fixup_ctty: ...@@ -1053,7 +1053,7 @@ fixup_ctty:
return ret; return ret;
} }
static int receive_fd(int pid, struct fdinfo_list_entry *fle) static int receive_fd(struct fdinfo_list_entry *fle)
{ {
int ret; int ret;
...@@ -1074,8 +1074,9 @@ static int receive_fd(int pid, struct fdinfo_list_entry *fle) ...@@ -1074,8 +1074,9 @@ static int receive_fd(int pid, struct fdinfo_list_entry *fle)
return 0; return 0;
} }
static int open_fdinfos(int pid, struct list_head *list) static int open_fdinfos(struct pstree_item *me)
{ {
struct list_head *list = &rsti(me)->fds;
struct fdinfo_list_entry *fle, *tmp; struct fdinfo_list_entry *fle, *tmp;
LIST_HEAD(completed); LIST_HEAD(completed);
bool progress, again; bool progress, again;
...@@ -1088,7 +1089,7 @@ static int open_fdinfos(int pid, struct list_head *list) ...@@ -1088,7 +1089,7 @@ static int open_fdinfos(int pid, struct list_head *list)
list_for_each_entry_safe(fle, tmp, list, ps_list) { list_for_each_entry_safe(fle, tmp, list, ps_list) {
st = fle->stage; st = fle->stage;
BUG_ON(st == FLE_RESTORED); BUG_ON(st == FLE_RESTORED);
ret = open_fd(pid, fle); ret = open_fd(fle);
if (ret == -1) if (ret == -1)
goto splice; goto splice;
if (st != fle->stage || ret == 0) if (st != fle->stage || ret == 0)
...@@ -1182,7 +1183,7 @@ int prepare_fds(struct pstree_item *me) ...@@ -1182,7 +1183,7 @@ int prepare_fds(struct pstree_item *me)
} }
} }
ret = open_fdinfos(me->pid->ns[0].virt, &rsti(me)->fds); ret = open_fdinfos(me);
close_service_fd(TRANSPORT_FD_OFF); close_service_fd(TRANSPORT_FD_OFF);
if (rsti(me)->fdt) if (rsti(me)->fdt)
......
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