Commit 21a45917 authored by andrew hendry's avatar andrew hendry Committed by David S. Miller

X.25 remove bkl in connect

Connect already has socket locking.
Signed-off-by: default avatarAndrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 141646ce
...@@ -751,7 +751,6 @@ static int x25_connect(struct socket *sock, struct sockaddr *uaddr, ...@@ -751,7 +751,6 @@ static int x25_connect(struct socket *sock, struct sockaddr *uaddr,
struct x25_route *rt; struct x25_route *rt;
int rc = 0; int rc = 0;
lock_kernel();
lock_sock(sk); lock_sock(sk);
if (sk->sk_state == TCP_ESTABLISHED && sock->state == SS_CONNECTING) { if (sk->sk_state == TCP_ESTABLISHED && sock->state == SS_CONNECTING) {
sock->state = SS_CONNECTED; sock->state = SS_CONNECTED;
...@@ -829,7 +828,6 @@ static int x25_connect(struct socket *sock, struct sockaddr *uaddr, ...@@ -829,7 +828,6 @@ static int x25_connect(struct socket *sock, struct sockaddr *uaddr,
x25_route_put(rt); x25_route_put(rt);
out: out:
release_sock(sk); release_sock(sk);
unlock_kernel();
return rc; return rc;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment