tipc: kill unnecessary goto's
authorwangweidong <wangweidong1@huawei.com>
Thu, 12 Dec 2013 01:36:40 +0000 (09:36 +0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 16 Dec 2013 17:48:35 +0000 (12:48 -0500)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/tipc/socket.c

index 32037c57937d8cfdc85a0606a8fbc8d57bf2d8cc..844bf349bb819f1531986aabc073dca747485606 100644 (file)
@@ -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)) {