diff options
| author |   Ursula Braun <ubraun@linux.vnet.ibm.com> | 2018-03-13 10:41:54 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-03-15 09:49:13 -0400 |
| commit | 3d502067599f0db12e74e6646aee8728efe3e5be (patch) | |
| tree | 1db2e80c9656338b5edf75e163abcd3c9863dbdf /net/smc/af_smc.c | |
| parent | sunvnet: does not support GSO for sctp (diff) | |
| download | linux-dev-3d502067599f0db12e74e6646aee8728efe3e5be.tar.xz linux-dev-3d502067599f0db12e74e6646aee8728efe3e5be.zip | |
net/smc: simplify wait when closing listen socket
Closing of a listen socket wakes up kernel_accept() of
smc_tcp_listen_worker(), and then has to wait till smc_tcp_listen_worker()
gives up the internal clcsock. The wait logic introduced with
commit 127f49705823 ("net/smc: release clcsock from tcp_listen_worker")
might wait longer than necessary. This patch implements the idea to
implement the wait just with flush_work(), and gets rid of the extra
smc_close_wait_listen_clcsock() function.
Fixes: 127f49705823 ("net/smc: release clcsock from tcp_listen_worker")
Reported-by: Hans Wippel <hwippel@linux.vnet.ibm.com>
Signed-off-by: Ursula Braun <ubraun@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/smc/af_smc.c')
| -rw-r--r-- | net/smc/af_smc.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c index 8cc97834d4f6..1e0d780855c3 100644 --- a/net/smc/af_smc.c +++ b/net/smc/af_smc.c @@ -978,10 +978,6 @@ out: lsmc->clcsock = NULL; } release_sock(lsk); - /* no more listening, wake up smc_close_wait_listen_clcsock and - * accept - */ - lsk->sk_state_change(lsk); sock_put(&lsmc->sk); /* sock_hold in smc_listen */ } |