Message ID | 1386311022-11176-6-git-send-email-wangweidong1@huawei.com |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show |
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 844bf34..83f466e 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))
when res<=0, return the res no need to add lock_sock. so remove it. Signed-off-by: Wang Weidong <wangweidong1@huawei.com> --- net/tipc/socket.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)