Commit 403dcb9d authored by Andrey Vagin's avatar Andrey Vagin Committed by Pavel Emelyanov

files: place the state POST_CREATE after the state RECV

It will be used for restoring epollfd.
Currently a transport fd may be added to epollfd.
epollfd should be populated, when all descriptors were already received.
Signed-off-by: 's avatarAndrey Vagin <avagin@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent ca567e76
...@@ -450,12 +450,12 @@ static int open_fdinfo(int pid, struct fdinfo_list_entry *fle, int state) ...@@ -450,12 +450,12 @@ static int open_fdinfo(int pid, struct fdinfo_list_entry *fle, int state)
case FD_STATE_CREATE: case FD_STATE_CREATE:
ret = open_fd(pid, fle->fe, fle->desc); ret = open_fd(pid, fle->fe, fle->desc);
break; break;
case FD_STATE_POST_CREATE:
ret = post_open_fd(pid, fle->fe, fle->desc);
break;
case FD_STATE_RECV: case FD_STATE_RECV:
ret = receive_fd(pid, fle->fe, fle->desc); ret = receive_fd(pid, fle->fe, fle->desc);
break; break;
case FD_STATE_POST_CREATE:
ret = post_open_fd(pid, fle->fe, fle->desc);
break;
} }
return ret; return ret;
......
...@@ -35,8 +35,8 @@ struct fd_parms { ...@@ -35,8 +35,8 @@ struct fd_parms {
enum fdinfo_states { enum fdinfo_states {
FD_STATE_PREP, /* Create unix sockets */ FD_STATE_PREP, /* Create unix sockets */
FD_STATE_CREATE, /* Create and send fd */ FD_STATE_CREATE, /* Create and send fd */
FD_STATE_POST_CREATE, /* Execute actions, when everyone was created */
FD_STATE_RECV, /* Receive fd */ FD_STATE_RECV, /* Receive fd */
FD_STATE_POST_CREATE, /* Execute actions, when everyone was created */
FD_STATE_MAX FD_STATE_MAX
}; };
......
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