Commit fd6ad75f authored by David S. Miller's avatar David S. Miller

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 35c35692 9d876d3e
......@@ -3501,6 +3501,7 @@ static int __init smc_init(void)
out_nl:
smc_nl_exit();
out_ism:
smc_clc_exit();
smc_ism_exit();
out_pernet_subsys_stat:
unregister_pernet_subsys(&smc_net_stat_ops);
......
......@@ -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 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment