diff options
| author | Ursula Braun <ubraun@linux.vnet.ibm.com> | 2017-01-09 16:55:25 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-09 16:07:40 -0500 |
| commit | b38d732477e4211351b2680e805d944f66bceec9 (patch) | |
| tree | c4d7764d21d9a5e6de2197292c7cf9b75a7aba81 /net/smc/smc_tx.c | |
| parent | 952310ccf2d861966cfb8706f16d5e4eb585edb7 (diff) | |
| download | op-kernel-dev-b38d732477e4211351b2680e805d944f66bceec9.zip op-kernel-dev-b38d732477e4211351b2680e805d944f66bceec9.tar.gz | |
smc: socket closing and linkgroup cleanup
smc_shutdown() and smc_release() handling
delayed linkgroup cleanup for linkgroups without connections
Signed-off-by: Ursula Braun <ubraun@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/smc/smc_tx.c')
| -rw-r--r-- | net/smc/smc_tx.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/smc/smc_tx.c b/net/smc/smc_tx.c index 7e8799f..6e73b28 100644 --- a/net/smc/smc_tx.c +++ b/net/smc/smc_tx.c @@ -139,6 +139,7 @@ int smc_tx_sendmsg(struct smc_sock *smc, struct msghdr *msg, size_t len) if (sk->sk_state == SMC_INIT) return -ENOTCONN; if (smc->sk.sk_shutdown & SEND_SHUTDOWN || + (smc->sk.sk_err == ECONNABORTED) || conn->local_tx_ctrl.conn_state_flags.peer_conn_abort) return -EPIPE; if (smc_cdc_rxed_any_close(conn)) @@ -392,6 +393,13 @@ int smc_tx_sndbuf_nonempty(struct smc_connection *conn) &pend); if (rc < 0) { if (rc == -EBUSY) { + struct smc_sock *smc = + container_of(conn, struct smc_sock, conn); + + if (smc->sk.sk_err == ECONNABORTED) { + rc = sock_error(&smc->sk); + goto out_unlock; + } rc = 0; schedule_work(&conn->tx_work); } |
