Commit 45fa1848 authored by Andrey Vagin's avatar Andrey Vagin Committed by Pavel Emelyanov

tcp: split the list tcp_repair_sockets on rst and cpt parts

because here are two types of entries
Signed-off-by: 's avatarAndrey Vagin <avagin@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 4c2a2264
...@@ -37,7 +37,8 @@ enum { ...@@ -37,7 +37,8 @@ enum {
#define TCPOPT_SACK_PERM TCPOPT_SACK_PERMITTED #define TCPOPT_SACK_PERM TCPOPT_SACK_PERMITTED
#endif #endif
static LIST_HEAD(tcp_repair_sockets); static LIST_HEAD(cpt_tcp_repair_sockets);
static LIST_HEAD(rst_tcp_repair_sockets);
static int tcp_repair_on(int fd) static int tcp_repair_on(int fd)
{ {
...@@ -74,7 +75,7 @@ static int tcp_repair_establised(int fd, struct inet_sk_desc *sk) ...@@ -74,7 +75,7 @@ static int tcp_repair_establised(int fd, struct inet_sk_desc *sk)
if (ret < 0) if (ret < 0)
goto err3; goto err3;
list_add_tail(&sk->rlist, &tcp_repair_sockets); list_add_tail(&sk->rlist, &cpt_tcp_repair_sockets);
return 0; return 0;
err3: err3:
...@@ -103,7 +104,7 @@ void tcp_unlock_all(void) ...@@ -103,7 +104,7 @@ void tcp_unlock_all(void)
{ {
struct inet_sk_desc *sk, *n; struct inet_sk_desc *sk, *n;
list_for_each_entry_safe(sk, n, &tcp_repair_sockets, rlist) list_for_each_entry_safe(sk, n, &cpt_tcp_repair_sockets, rlist)
tcp_unlock_one(sk); tcp_unlock_one(sk);
} }
...@@ -524,14 +525,14 @@ int restore_one_tcp(int fd, struct inet_sk_info *ii) ...@@ -524,14 +525,14 @@ int restore_one_tcp(int fd, struct inet_sk_info *ii)
void tcp_locked_conn_add(struct inet_sk_info *ii) void tcp_locked_conn_add(struct inet_sk_info *ii)
{ {
list_add_tail(&ii->rlist, &tcp_repair_sockets); list_add_tail(&ii->rlist, &rst_tcp_repair_sockets);
} }
void tcp_unlock_connections(void) void tcp_unlock_connections(void)
{ {
struct inet_sk_info *ii; struct inet_sk_info *ii;
list_for_each_entry(ii, &tcp_repair_sockets, rlist) list_for_each_entry(ii, &rst_tcp_repair_sockets, rlist)
nf_unlock_connection_info(ii); nf_unlock_connection_info(ii);
} }
......
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