diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-12-02 11:44:56 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-12-02 11:44:56 -0800 |
| commit | fc993be36f9ea7fc286d84d8471a1a20e871aad4 (patch) | |
| tree | cef440a299ed7d1c2418992f7d724b4d86e6d83b /net/smc | |
| parent | 36d7d36fcf69e7f95068307f8bc519af31085431 (diff) | |
| parent | a51e3ac43ddbad891c2b1a4f3aa52371d6939570 (diff) | |
| download | linux-stable-fc993be36f9ea7fc286d84d8471a1a20e871aad4.tar.gz linux-stable-fc993be36f9ea7fc286d84d8471a1a20e871aad4.tar.bz2 linux-stable-fc993be36f9ea7fc286d84d8471a1a20e871aad4.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/smc')
| -rw-r--r-- | net/smc/smc_close.c | 8 | ||||
| -rw-r--r-- | net/smc/smc_core.c | 7 |
2 files changed, 9 insertions, 6 deletions
diff --git a/net/smc/smc_close.c b/net/smc/smc_close.c index 3715d2f5ad55..292e4d904ab6 100644 --- a/net/smc/smc_close.c +++ b/net/smc/smc_close.c @@ -195,6 +195,7 @@ int smc_close_active(struct smc_sock *smc) int old_state; long timeout; int rc = 0; + int rc1 = 0; timeout = current->flags & PF_EXITING ? 0 : sock_flag(sk, SOCK_LINGER) ? @@ -232,8 +233,11 @@ again: /* actively shutdown clcsock before peer close it, * prevent peer from entering TIME_WAIT state. */ - if (smc->clcsock && smc->clcsock->sk) - rc = kernel_sock_shutdown(smc->clcsock, SHUT_RDWR); + if (smc->clcsock && smc->clcsock->sk) { + rc1 = kernel_sock_shutdown(smc->clcsock, + SHUT_RDWR); + rc = rc ? rc : rc1; + } } else { /* peer event has changed the state */ goto again; diff --git a/net/smc/smc_core.c b/net/smc/smc_core.c index bb52c8b5f148..387d28b2f8dd 100644 --- a/net/smc/smc_core.c +++ b/net/smc/smc_core.c @@ -625,18 +625,17 @@ int smcd_nl_get_lgr(struct sk_buff *skb, struct netlink_callback *cb) void smc_lgr_cleanup_early(struct smc_connection *conn) { struct smc_link_group *lgr = conn->lgr; - struct list_head *lgr_list; spinlock_t *lgr_lock; if (!lgr) return; smc_conn_free(conn); - lgr_list = smc_lgr_list_head(lgr, &lgr_lock); + smc_lgr_list_head(lgr, &lgr_lock); spin_lock_bh(lgr_lock); /* do not use this link group for new connections */ - if (!list_empty(lgr_list)) - list_del_init(lgr_list); + if (!list_empty(&lgr->list)) + list_del_init(&lgr->list); spin_unlock_bh(lgr_lock); __smc_lgr_terminate(lgr, true); } |