diff options
| author | David S. Miller <davem@davemloft.net> | 2023-03-15 09:15:20 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-03-15 09:15:20 +0100 |
| commit | fd6ad75f8c008925e279576dc749ad12aa3fb64b (patch) | |
| tree | 15eb91ba7cad8b338035cf91b4da682cfaac2b09 | |
| parent | mlxsw: spectrum: Fix incorrect parsing depth after reload (diff) | |
| parent | net/smc: Fix device de-init sequence (diff) | |
| download | linux-fd6ad75f8c008925e279576dc749ad12aa3fb64b.tar.xz linux-fd6ad75f8c008925e279576dc749ad12aa3fb64b.zip | |
Merge branch 'net-smc-fixes'
Wenjia Zhang says:
====================
net/smc: Fixes 2023-03-01
The 1st patch solves the problem that CLC message initialization was
not properly reversed in error handling path. And the 2nd one fixes
the possible deadlock triggered by cancel_delayed_work_sync().
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/smc/af_smc.c | 1 | ||||
| -rw-r--r-- | net/smc/smc_core.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c index ff6dd86bdc9f..c6b4a62276f6 100644 --- a/net/smc/af_smc.c +++ b/net/smc/af_smc.c @@ -3501,6 +3501,7 @@ out_pnet: out_nl: smc_nl_exit(); out_ism: + smc_clc_exit(); smc_ism_exit(); out_pernet_subsys_stat: unregister_pernet_subsys(&smc_net_stat_ops); diff --git a/net/smc/smc_core.c b/net/smc/smc_core.c index d52060b2680c..454356771cda 100644 --- a/net/smc/smc_core.c +++ b/net/smc/smc_core.c @@ -1464,7 +1464,7 @@ static void __smc_lgr_terminate(struct smc_link_group *lgr, bool soft) if (lgr->terminating) return; /* lgr already terminating */ /* cancel free_work sync, will terminate when lgr->freeing is set */ - cancel_delayed_work_sync(&lgr->free_work); + cancel_delayed_work(&lgr->free_work); lgr->terminating = 1; /* kill remaining link group connections */ |