| Message ID | 1387937473-5804-3-git-send-email-wangweidong1@huawei.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
Hello. On 25-12-2013 6:11, Wang Weidong wrote: > In commit 3b8401fe9d ("tipc: kill unnecessary goto's") didn't make > the code look most readability, Only "readable". The same error in the subject. > 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> > --- > net/tipc/socket.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Wang Weidong <wangweidong1@huawei.com> On 2013/12/25 18:47, Sergei Shtylyov wrote: > Hello. > > On 25-12-2013 6:11, Wang Weidong wrote: > >> In commit 3b8401fe9d ("tipc: kill unnecessary goto's") didn't make >> the code look most readability, > > Only "readable". The same error in the subject. > Thanks. I will fix it in v3. Regards, Wang >> 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> >> --- >> net/tipc/socket.c | 7 ++----- >> 1 file changed, 2 insertions(+), 5 deletions(-) > > WBR, Sergei > > -- > To unsubscribe from this list: send the line "unsubscribe netdev" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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; }
In commit 3b8401fe9d ("tipc: kill unnecessary goto's") didn't make the code look most readability, 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> --- net/tipc/socket.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)