]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
tipc: make the code look more readable
authorwangweidong <wangweidong1@huawei.com>
Fri, 27 Dec 2013 02:09:39 +0000 (10:09 +0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 2 Jan 2014 08:30:35 +0000 (03:30 -0500)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/tipc/socket.c

index 83f466e57feaa23e3fca04cc2cde4256ada86c33..5efdeef06f9d51453652e77f46f91867265d943c 100644 (file)
@@ -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;
        }