From: andrew hendry <andrew.hendry@gmail.com>
Date: Tue, 14 Sep 2010 13:31:16 +0000 (+0000)
Subject: X.25 remove bkl in listen
X-Git-Tag: v2.6.37-rc1~147^2~455
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=25aa4efe4feb4150fe613169795df505c5018f2b;p=~shefty%2Frdma-dev.git

X.25 remove bkl in listen

Listen updates socket values and needs lock_sock.

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 5e86d4e97dc..f6a8f175b4f 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -507,14 +507,14 @@ static int x25_listen(struct socket *sock, int backlog)
 	struct sock *sk = sock->sk;
 	int rc = -EOPNOTSUPP;
 
-	lock_kernel();
+	lock_sock(sk);
 	if (sk->sk_state != TCP_LISTEN) {
 		memset(&x25_sk(sk)->dest_addr, 0, X25_ADDR_LEN);
 		sk->sk_max_ack_backlog = backlog;
 		sk->sk_state           = TCP_LISTEN;
 		rc = 0;
 	}
-	unlock_kernel();
+	release_sock(sk);
 
 	return rc;
 }