| Message ID | 1387197631-17240-3-git-send-email-wangweidong1@huawei.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
> From: Wang Weidong > Sent: 16 December 2013 12:40 > Remove a number of needless 'goto exit' in send_stream > when the socket is in an unconnected state. > This patch is cosmetic and does not alter the operation of > TIPC in any way. > > Reviewed-by: Jon Maloy <jon.maloy@ericsson.com> > Reviewed-by: Erik Hugne <erik.hugne@ericsson.com> > Signed-off-by: Wang Weidong <wangweidong1@huawei.com> > --- > net/tipc/socket.c | 14 ++++++-------- > 1 file changed, 6 insertions(+), 8 deletions(-) > > diff --git a/net/tipc/socket.c b/net/tipc/socket.c > index 32037c5..844bf34 100644 > --- a/net/tipc/socket.c > +++ b/net/tipc/socket.c > @@ -751,16 +751,14 @@ static int send_stream(struct kiocb *iocb, struct socket *sock, > > /* Handle special cases where there is no connection */ > if (unlikely(sock->state != SS_CONNECTED)) { > - if (sock->state == SS_UNCONNECTED) { > + res = -ENOTCONN; > + > + if (sock->state == SS_UNCONNECTED) > res = send_packet(NULL, sock, m, total_len); > - goto exit; > - } else if () { > + else if (sock->state == SS_DISCONNECTING) > res = -EPIPE; > - goto exit; > - } else { > - res = -ENOTCONN; > - goto exit; > - } > + > + goto exit; I'm not sure that 'removing needless gotos' is a good description of the change. Possibly the code is easier to read with only one goto, ymmv. You could remove the 'else' after the 'goto'. Maybe the easiest to read is: if (sock->state == SS_UNCONNECTED) res = send_packet(NULL, sock, m, total_len); else res = sock->state == SS_DISCONNECTING ? -EPIPE : -ENOTCONN; goto exit; David -- 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/16 21:30, David Laight wrote: >> From: Wang Weidong >> Sent: 16 December 2013 12:40 >> Remove a number of needless 'goto exit' in send_stream >> when the socket is in an unconnected state. >> This patch is cosmetic and does not alter the operation of >> TIPC in any way. >> >> Reviewed-by: Jon Maloy <jon.maloy@ericsson.com> >> Reviewed-by: Erik Hugne <erik.hugne@ericsson.com> >> Signed-off-by: Wang Weidong <wangweidong1@huawei.com> >> --- >> net/tipc/socket.c | 14 ++++++-------- >> 1 file changed, 6 insertions(+), 8 deletions(-) >> >> diff --git a/net/tipc/socket.c b/net/tipc/socket.c >> index 32037c5..844bf34 100644 >> --- a/net/tipc/socket.c >> +++ b/net/tipc/socket.c >> @@ -751,16 +751,14 @@ static int send_stream(struct kiocb *iocb, struct socket *sock, >> >> /* Handle special cases where there is no connection */ >> if (unlikely(sock->state != SS_CONNECTED)) { >> - if (sock->state == SS_UNCONNECTED) { >> + res = -ENOTCONN; >> + >> + if (sock->state == SS_UNCONNECTED) >> res = send_packet(NULL, sock, m, total_len); >> - goto exit; >> - } else if () { >> + else if (sock->state == SS_DISCONNECTING) >> res = -EPIPE; >> - goto exit; >> - } else { >> - res = -ENOTCONN; >> - goto exit; >> - } >> + >> + goto exit; > > I'm not sure that 'removing needless gotos' is a good description of the change. > Possibly the code is easier to read with only one goto, ymmv. I thinks so. > You could remove the 'else' after the 'goto'. > Maybe the easiest to read is: > if (sock->state == SS_UNCONNECTED) > res = send_packet(NULL, sock, m, total_len); > else > res = sock->state == SS_DISCONNECTING ? -EPIPE : -ENOTCONN; > goto exit; > > David > Thanks for your suggestion. I will fix it too. Regards. Wang > > > -- > 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
From: Wang Weidong <weidong1991.wang@gmail.com> Date: Mon, 16 Dec 2013 22:19:47 +0800 > Thanks for your suggestion. I will fix it too. You are going to have to send me relative fixups as I already applied your original series from last week. -- 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/17 2:01, David Miller wrote: > From: Wang Weidong <weidong1991.wang@gmail.com> > Date: Mon, 16 Dec 2013 22:19:47 +0800 > >> Thanks for your suggestion. I will fix it too. > > You are going to have to send me relative fixups as I already > applied your original series from last week. Ok, I will send them soon. Regards. Wang > -- > 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 32037c5..844bf34 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -751,16 +751,14 @@ static int send_stream(struct kiocb *iocb, struct socket *sock, /* Handle special cases where there is no connection */ if (unlikely(sock->state != SS_CONNECTED)) { - if (sock->state == SS_UNCONNECTED) { + res = -ENOTCONN; + + if (sock->state == SS_UNCONNECTED) res = send_packet(NULL, sock, m, total_len); - goto exit; - } else if (sock->state == SS_DISCONNECTING) { + else if (sock->state == SS_DISCONNECTING) res = -EPIPE; - goto exit; - } else { - res = -ENOTCONN; - goto exit; - } + + goto exit; } if (unlikely(m->msg_name)) {