diff options
| author | wangweidong <wangweidong1@huawei.com> | 2013-12-11 20:36:40 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-16 12:48:35 -0500 |
| commit | 3b8401fe9dba490b81b30deaa9bf4f89120bb5ba (patch) | |
| tree | 39f9a586f12d712fa0276df3187a7ef8807009bb | |
| parent | 0cee6bbe06f67ff7dd83a4bc794f23c5cd5e7929 (diff) | |
tipc: kill unnecessary goto's
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>
| -rw-r--r-- | net/tipc/socket.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 32037c57937d..844bf349bb81 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, | |||
| 751 | 751 | ||
| 752 | /* Handle special cases where there is no connection */ | 752 | /* Handle special cases where there is no connection */ |
| 753 | if (unlikely(sock->state != SS_CONNECTED)) { | 753 | if (unlikely(sock->state != SS_CONNECTED)) { |
| 754 | if (sock->state == SS_UNCONNECTED) { | 754 | res = -ENOTCONN; |
| 755 | |||
| 756 | if (sock->state == SS_UNCONNECTED) | ||
| 755 | res = send_packet(NULL, sock, m, total_len); | 757 | res = send_packet(NULL, sock, m, total_len); |
| 756 | goto exit; | 758 | else if (sock->state == SS_DISCONNECTING) |
| 757 | } else if (sock->state == SS_DISCONNECTING) { | ||
| 758 | res = -EPIPE; | 759 | res = -EPIPE; |
| 759 | goto exit; | 760 | |
| 760 | } else { | 761 | goto exit; |
| 761 | res = -ENOTCONN; | ||
| 762 | goto exit; | ||
| 763 | } | ||
| 764 | } | 762 | } |
| 765 | 763 | ||
| 766 | if (unlikely(m->msg_name)) { | 764 | if (unlikely(m->msg_name)) { |
