diff options
| author | Sowmini Varadhan <sowmini.varadhan@oracle.com> | 2016-06-04 22:59:59 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-08 00:10:15 +0200 |
| commit | 0b6f760cff04a7cdfafc3ec6915e91fed0533d8d (patch) | |
| tree | 4906aec845e45e335b0ed779e0e208b341cdd4da /net | |
| parent | RDS: TCP: Add/use rds_tcp_reset_callbacks to reset tcp socket safely (diff) | |
| download | linux-0b6f760cff04a7cdfafc3ec6915e91fed0533d8d.tar.xz linux-0b6f760cff04a7cdfafc3ec6915e91fed0533d8d.zip | |
RDS: TCP: Retransmit half-sent datagrams when switching sockets in rds_tcp_reset_callbacks
When we switch a connection's sockets in rds_tcp_rest_callbacks,
any partially sent datagram must be retransmitted on the new
socket so that the receiver can correctly reassmble the RDS
datagram. Use rds_send_reset() which is designed for this purpose.
Signed-off-by: Sowmini Varadhan <sowmini.varadhan@oracle.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/rds/send.c | 1 | ||||
| -rw-r--r-- | net/rds/tcp.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/rds/send.c b/net/rds/send.c index c9cdb358ea88..b1962f8e30f7 100644 --- a/net/rds/send.c +++ b/net/rds/send.c @@ -99,6 +99,7 @@ void rds_send_reset(struct rds_connection *conn) list_splice_init(&conn->c_retrans, &conn->c_send_queue); spin_unlock_irqrestore(&conn->c_lock, flags); } +EXPORT_SYMBOL_GPL(rds_send_reset); static int acquire_in_xmit(struct rds_connection *conn) { diff --git a/net/rds/tcp.c b/net/rds/tcp.c index 8faa0b1ae39d..7ab1b41ffc88 100644 --- a/net/rds/tcp.c +++ b/net/rds/tcp.c @@ -173,6 +173,7 @@ void rds_tcp_reset_callbacks(struct socket *sock, release_sock(osock->sk); sock_release(osock); newsock: + rds_send_reset(conn); lock_sock(sock->sk); write_lock_bh(&sock->sk->sk_callback_lock); tc->t_sock = sock; |