diff options
| author |   Ursula Braun <ubraun@linux.vnet.ibm.com> | 2018-03-14 11:01:01 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-03-14 13:40:44 -0400 |
| commit | 268ffcc4ebfc8b10c1502357dfb82ce6af0770ac (patch) | |
| tree | 10632783df5be2c7eb73c0d2e73dda49bafab625 /net/smc | |
| parent | net/smc: pay attention to MAX_ORDER for CQ entries (diff) | |
| download | linux-dev-268ffcc4ebfc8b10c1502357dfb82ce6af0770ac.tar.xz linux-dev-268ffcc4ebfc8b10c1502357dfb82ce6af0770ac.zip | |
net/smc: free link group without pending free_work only
Make sure there is no pending or running free_work worker for the link
group when freeing the link group.
Signed-off-by: Ursula Braun <ubraun@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/smc')
| -rw-r--r-- | net/smc/af_smc.c | 1 | ||||
| -rw-r--r-- | net/smc/smc_core.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c index 2c6f4e0a9f3d..649489f825a5 100644 --- a/net/smc/af_smc.c +++ b/net/smc/af_smc.c @@ -1477,6 +1477,7 @@ static void __exit smc_exit(void) spin_unlock_bh(&smc_lgr_list.lock); list_for_each_entry_safe(lgr, lg, &lgr_freeing_list, list) { list_del_init(&lgr->list); + cancel_delayed_work_sync(&lgr->free_work); smc_lgr_free(lgr); /* free link group */ } static_branch_disable(&tcp_have_smc); diff --git a/net/smc/smc_core.c b/net/smc/smc_core.c index f76f60e463cb..ec6189fe2a48 100644 --- a/net/smc/smc_core.c +++ b/net/smc/smc_core.c @@ -140,7 +140,8 @@ static void smc_lgr_free_work(struct work_struct *work) list_del_init(&lgr->list); /* remove from smc_lgr_list */ free: spin_unlock_bh(&smc_lgr_list.lock); - smc_lgr_free(lgr); + if (!delayed_work_pending(&lgr->free_work)) + smc_lgr_free(lgr); } /* create a new SMC link group */ |