From: Wang Weidong <wangweidong1@huawei.com>
To: <jon.maloy@ericsson.com>, <allan.stephens@windriver.com>,
<davem@davemloft.net>
Cc: <David.Laight@ACULAB.COM>, <netdev@vger.kernel.org>,
Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>,
Ying Xue <ying.xue@windriver.com>
Subject: [PATCH net-next RESEND v3] tipc: make the code look more readable
Date: Fri, 27 Dec 2013 10:09:39 +0800 [thread overview]
Message-ID: <52BCE163.2060706@huawei.com> (raw)
In-Reply-To: <52BCDBA4.9050607@huawei.com>
In commit 3b8401fe9d ("tipc: kill unnecessary goto's") didn't make
the code look most readable, so fix it. This patch is cosmetic
and does not change the operation of TIPC in any way.
Suggested-by: David Laight <David.Laight@ACULAB.COM>
Signed-off-by: Wang Weidong <wangweidong1@huawei.com>
---
Change note:
v3: fix the spelling error which pointed out by Sergei.
v2: fix the problem "Referring commit purely by
SHA1 ID is ambiguous" which pointed out by David.
---
net/tipc/socket.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 83f466e..5efdeef 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -751,13 +751,10 @@ static int send_stream(struct kiocb *iocb, struct socket *sock,
/* Handle special cases where there is no connection */
if (unlikely(sock->state != SS_CONNECTED)) {
- res = -ENOTCONN;
-
if (sock->state == SS_UNCONNECTED)
res = send_packet(NULL, sock, m, total_len);
- else if (sock->state == SS_DISCONNECTING)
- res = -EPIPE;
-
+ else
+ res = sock->state == SS_DISCONNECTING ? -EPIPE : -ENOTCONN;
goto exit;
}
--
1.7.12
next prev parent reply other threads:[~2013-12-27 2:11 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-17 7:03 [PATCH net-next 0/2] tipc: do some fixups Wang Weidong
2013-12-17 7:03 ` [PATCH net-next 1/2] tipc: make the code look more better Wang Weidong
2013-12-17 7:03 ` [PATCH net-next 2/2] tipc: make the code look more readability Wang Weidong
2013-12-27 1:45 ` [PATCH net-next v3 2/2] tipc: make the code look more readable Wang Weidong
2013-12-27 1:51 ` Ying Xue
2013-12-27 1:59 ` Wang Weidong
2013-12-27 4:04 ` David Miller
2013-12-27 2:09 ` Wang Weidong [this message]
2013-12-27 4:04 ` [PATCH net-next RESEND v3] " David Miller
2013-12-27 4:21 ` Wang Weidong
2013-12-24 22:45 ` [PATCH net-next 0/2] tipc: do some fixups David Miller
2013-12-25 1:33 ` Wang Weidong
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=52BCE163.2060706@huawei.com \
--to=wangweidong1@huawei.com \
--cc=David.Laight@ACULAB.COM \
--cc=allan.stephens@windriver.com \
--cc=davem@davemloft.net \
--cc=jon.maloy@ericsson.com \
--cc=netdev@vger.kernel.org \
--cc=sergei.shtylyov@cogentembedded.com \
--cc=ying.xue@windriver.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.