diff options
| author | wangweidong <wangweidong1@huawei.com> | 2013-12-12 09:36:42 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-16 12:48:35 -0500 |
| commit | d3fbccf2b01f8262faa1479712be6a55c626bdef (patch) | |
| tree | 4f46ab8e4e49db33fcb9a95a7381c2aa4f37a8f2 /net/tipc/socket.c | |
| parent | 776a74ce07a6e325fcfc04e272389947b1281159 (diff) | |
| download | linux-d3fbccf2b01f8262faa1479712be6a55c626bdef.tar.bz2 | |
tipc: change lock_sock order in connect()
Instead of reaquiring the socket lock and taking the normal exit
path when a connection times out, we bail out early with a
return -ETIMEDOUT.
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>
Diffstat (limited to 'net/tipc/socket.c')
| -rw-r--r-- | net/tipc/socket.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 844bf349bb81..83f466e57fea 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -1507,14 +1507,12 @@ static int connect(struct socket *sock, struct sockaddr *dest, int destlen, sock->state != SS_CONNECTING, timeout ? (long)msecs_to_jiffies(timeout) : MAX_SCHEDULE_TIMEOUT); - lock_sock(sk); if (res <= 0) { if (res == 0) res = -ETIMEDOUT; - else - ; /* leave "res" unchanged */ - goto exit; + return res; } + lock_sock(sk); } if (unlikely(sock->state == SS_DISCONNECTING)) |