From: Ursula Braun <ubraun@linux.vnet.ibm.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, linux-s390@vger.kernel.org,
jwi@linux.vnet.ibm.com, schwidefsky@de.ibm.com,
heiko.carstens@de.ibm.com, raspl@linux.vnet.ibm.com,
ubraun@linux.vnet.ibm.com
Subject: [PATCH net-next 2/6] net/smc: simplify function smc_clcsock_accept()
Date: Wed, 24 Jan 2018 10:28:13 +0100 [thread overview]
Message-ID: <20180124092817.103089-3-ubraun@linux.vnet.ibm.com> (raw)
In-Reply-To: <20180124092817.103089-1-ubraun@linux.vnet.ibm.com>
Cleanup to avoid duplicate code in smc_clcsock_accept().
No functional change.
Signed-off-by: Ursula Braun <ubraun@linux.vnet.ibm.com>
---
net/smc/af_smc.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index eccccf743b9f..05cbcd3a6f60 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -599,16 +599,9 @@ static int smc_clcsock_accept(struct smc_sock *lsmc, struct smc_sock **new_smc)
rc = kernel_accept(lsmc->clcsock, &new_clcsock, 0);
lock_sock(lsk);
- if (rc < 0) {
+ if (rc < 0)
lsk->sk_err = -rc;
- new_sk->sk_state = SMC_CLOSED;
- sock_set_flag(new_sk, SOCK_DEAD);
- new_sk->sk_prot->unhash(new_sk);
- sock_put(new_sk);
- *new_smc = NULL;
- goto out;
- }
- if (lsk->sk_state == SMC_CLOSED) {
+ if (rc < 0 || lsk->sk_state == SMC_CLOSED) {
if (new_clcsock)
sock_release(new_clcsock);
new_sk->sk_state = SMC_CLOSED;
--
2.13.5
next prev parent reply other threads:[~2018-01-24 9:28 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-24 9:28 [PATCH net-next 0/6] net/smc: socket closing improvements Ursula Braun
2018-01-24 9:28 ` [PATCH net-next 1/6] net/smc: use local struct sock variables consistently Ursula Braun
2018-01-24 9:28 ` Ursula Braun [this message]
2018-01-24 9:28 ` [PATCH net-next 3/6] net/smc: get rid of tx_pend waits in socket closing Ursula Braun
2018-01-24 9:28 ` [PATCH net-next 4/6] net/smc: make wait for work request uninterruptible Ursula Braun
2018-01-24 9:28 ` [PATCH net-next 5/6] net/smc: improve state change handling after close wait Ursula Braun
2018-01-24 9:28 ` [PATCH net-next 6/6] net/smc: continue waiting if peer signals write_shutdown Ursula Braun
2018-01-24 15:55 ` [PATCH net-next 0/6] net/smc: socket closing improvements 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=20180124092817.103089-3-ubraun@linux.vnet.ibm.com \
--to=ubraun@linux.vnet.ibm.com \
--cc=davem@davemloft.net \
--cc=heiko.carstens@de.ibm.com \
--cc=jwi@linux.vnet.ibm.com \
--cc=linux-s390@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=raspl@linux.vnet.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).