| Message ID | 52BCDBA4.9050607@huawei.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On 12/27/2013 09:45 AM, Wang Weidong wrote: > 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. > > 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. > Please don't add review version history into patch head comments. > 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(-) > > 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; > } > > -- 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
On 2013/12/27 9:51, Ying Xue wrote: > On 12/27/2013 09:45 AM, Wang Weidong wrote: >> 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. >> >> 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. >> > > Please don't add review version history into patch head comments. > Ok, Got it. Thanks, Wang > >> 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(-) >> >> 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; >> } >> >> > > > . > -- 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: Ying Xue <ying.xue@windriver.com> Date: Fri, 27 Dec 2013 09:51:08 +0800 > On 12/27/2013 09:45 AM, Wang Weidong wrote: >> 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. >> >> 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. >> > > Please don't add review version history into patch head comments. And please _always_ resubmit the entire series, not just the patches you are changing. -- 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 readable, so fix it. This patch is cosmetic and does not change the operation of TIPC in any way. 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. 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(-)