From: Ursula Braun <ubraun@linux.ibm.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, linux-s390@vger.kernel.org,
schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com,
raspl@linux.ibm.com, ubraun@linux.ibm.com
Subject: [PATCH net-next 07/10] net/smc: cleanup listen worker mutex unlocking
Date: Thu, 22 Nov 2018 10:26:40 +0100 [thread overview]
Message-ID: <20181122092643.26820-8-ubraun@linux.ibm.com> (raw)
In-Reply-To: <20181122092643.26820-1-ubraun@linux.ibm.com>
For easier reading move the unlock of mutex smc_create_lgr_pending into
smc_listen_work(), i.e. into the function the mutex has been locked.
No functional change.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Ursula Braun <ubraun@linux.ibm.com>
---
net/smc/af_smc.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index 93f7ff8f6e88..7657e249f526 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -1182,7 +1182,6 @@ static int smc_listen_rdma_finish(struct smc_sock *new_smc,
return 0;
decline:
- mutex_unlock(&smc_create_lgr_pending);
smc_listen_decline(new_smc, reason_code, local_contact);
return reason_code;
}
@@ -1282,8 +1281,10 @@ static void smc_listen_work(struct work_struct *work)
/* finish worker */
if (!ism_supported) {
- if (smc_listen_rdma_finish(new_smc, &cclc, local_contact))
+ if (smc_listen_rdma_finish(new_smc, &cclc, local_contact)) {
+ mutex_unlock(&smc_create_lgr_pending);
return;
+ }
}
smc_conn_save_peer_info(new_smc, &cclc);
mutex_unlock(&smc_create_lgr_pending);
--
2.16.4
next prev parent reply other threads:[~2018-11-22 20:05 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-22 9:26 [PATCH net-next 00/10] net/smc: patches 2018-11-22 Ursula Braun
2018-11-22 9:26 ` [PATCH net-next 01/10] net/smc: cleanup tcp_listen_worker initialization Ursula Braun
2018-11-22 9:26 ` [PATCH net-next 02/10] net/smc: make smc_lgr_free() static Ursula Braun
2018-11-22 9:26 ` [PATCH net-next 03/10] net/smc: remove sock_error detour in clc-functions Ursula Braun
2018-11-22 9:26 ` [PATCH net-next 04/10] net/smc: allow fallback after clc timeouts Ursula Braun
2018-11-22 9:26 ` [PATCH net-next 05/10] net/smc: no link delete for a never active link Ursula Braun
2018-11-22 9:26 ` [PATCH net-next 06/10] net/smc: short wait for late smc_clc_wait_msg Ursula Braun
2018-11-22 9:26 ` Ursula Braun [this message]
2018-11-22 9:26 ` [PATCH net-next 08/10] net/smc: avoid a delay by waiting for nothing Ursula Braun
2018-11-22 9:26 ` [PATCH net-next 09/10] net/smc: add infrastructure to send delete rkey messages Ursula Braun
2018-11-22 9:26 ` [PATCH net-next 10/10] net/smc: unregister rkeys of unused buffer Ursula Braun
2018-11-24 1:20 ` [PATCH net-next 00/10] net/smc: patches 2018-11-22 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181122092643.26820-8-ubraun@linux.ibm.com \
--to=ubraun@linux.ibm.com \
--cc=davem@davemloft.net \
--cc=heiko.carstens@de.ibm.com \
--cc=linux-s390@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=raspl@linux.ibm.com \
--cc=schwidefsky@de.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).