diff options
author | Karsten Graul <kgraul@linux.ibm.com> | 2019-02-12 16:29:54 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-02-12 11:59:45 -0500 |
commit | e78b2622266ce962b18efad8f29acdc6052db010 (patch) | |
tree | 431987a9a014630d7efae77073ebedd979429144 /net/smc/smc_core.c | |
parent | cf0cfe535845cf60830e1482f7e618d80140e8d9 (diff) | |
download | linux-stable-e78b2622266ce962b18efad8f29acdc6052db010.tar.gz linux-stable-e78b2622266ce962b18efad8f29acdc6052db010.tar.bz2 linux-stable-e78b2622266ce962b18efad8f29acdc6052db010.zip |
net/smc: check connections in smc_lgr_free_work
Remove the shortcut that smc_lgr_free() would skip the check for
existing connections when the link group is not in the link group list.
Signed-off-by: Karsten Graul <kgraul@linux.ibm.com>
Signed-off-by: Ursula Braun <ubraun@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/smc/smc_core.c')
-rw-r--r-- | net/smc/smc_core.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/smc/smc_core.c b/net/smc/smc_core.c index 349d789a9728..53a17cfa61af 100644 --- a/net/smc/smc_core.c +++ b/net/smc/smc_core.c @@ -160,8 +160,6 @@ static void smc_lgr_free_work(struct work_struct *work) bool conns; spin_lock_bh(&smc_lgr_list.lock); - if (list_empty(&lgr->list)) - goto free; read_lock_bh(&lgr->conns_lock); conns = RB_EMPTY_ROOT(&lgr->conns_all); read_unlock_bh(&lgr->conns_lock); @@ -169,8 +167,8 @@ static void smc_lgr_free_work(struct work_struct *work) spin_unlock_bh(&smc_lgr_list.lock); return; } - list_del_init(&lgr->list); /* remove from smc_lgr_list */ -free: + if (!list_empty(&lgr->list)) + list_del_init(&lgr->list); /* remove from smc_lgr_list */ spin_unlock_bh(&smc_lgr_list.lock); if (!lgr->is_smcd && !lgr->terminating) { |