From: andrew hendry <andrew.hendry@gmail.com>
Date: Tue, 14 Sep 2010 13:32:03 +0000 (+0000)
Subject: X.25 remove bkl in connect
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=21a4591794c82c1a73f9d45d6400f878648261e3;p=openwrt%2Fstaging%2Fblogic.git

X.25 remove bkl in connect

Connect already has socket locking.

Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index 04321eec65e1..c1bbf9ec71f4 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -751,7 +751,6 @@ static int x25_connect(struct socket *sock, struct sockaddr *uaddr,
 	struct x25_route *rt;
 	int rc = 0;
 
-	lock_kernel();
 	lock_sock(sk);
 	if (sk->sk_state == TCP_ESTABLISHED && sock->state == SS_CONNECTING) {
 		sock->state = SS_CONNECTED;
@@ -829,7 +828,6 @@ out_put_route:
 	x25_route_put(rt);
 out:
 	release_sock(sk);
-	unlock_kernel();
 	return rc;
 }