Commit 28a14747 authored by Pavel Emelyanov's avatar Pavel Emelyanov

usk: The INFLIGHT flag is no longer used

It was required before we switched to socketpair restore
scheme. Now it's not required, sockets just connect to
the peer they want to.
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 705bf5ab
...@@ -93,14 +93,12 @@ struct pipe_data_entry { ...@@ -93,14 +93,12 @@ struct pipe_data_entry {
*/ */
#define PIPE_NONALIG_DATA (15 * PAGE_SIZE) #define PIPE_NONALIG_DATA (15 * PAGE_SIZE)
#define USK_INFLIGHT 1
struct unix_sk_entry { struct unix_sk_entry {
u32 id; u32 id;
u8 type; u8 type;
u8 state; u8 state;
u8 namelen; /* fits UNIX_PATH_MAX */ u8 namelen; /* fits UNIX_PATH_MAX */
u8 flags; u8 pad;
u32 backlog; u32 backlog;
u32 peer; u32 peer;
u8 name[0]; u8 name[0];
......
...@@ -390,8 +390,6 @@ static int dump_one_unix(const struct socket_desc *_sk, int fd, int lfd, ...@@ -390,8 +390,6 @@ static int dump_one_unix(const struct socket_desc *_sk, int fd, int lfd,
ue.state = sk->state; ue.state = sk->state;
ue.namelen = sk->namelen; ue.namelen = sk->namelen;
ue.backlog = sk->wqlen; ue.backlog = sk->wqlen;
ue.flags = 0;
ue.peer = sk->peer_ino; ue.peer = sk->peer_ino;
if (ue.peer) { if (ue.peer) {
...@@ -438,7 +436,6 @@ static int dump_one_unix(const struct socket_desc *_sk, int fd, int lfd, ...@@ -438,7 +436,6 @@ static int dump_one_unix(const struct socket_desc *_sk, int fd, int lfd,
goto err; goto err;
} }
ue.flags |= USK_INFLIGHT;
ue.peer = e->sk_desc->sd.ino; ue.peer = e->sk_desc->sd.ino;
pr_debug("\t\tFixed inflight socket %d peer %d)\n", pr_debug("\t\tFixed inflight socket %d peer %d)\n",
......
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