summaryrefslogtreecommitdiffstats
path: root/net/x25
diff options
context:
space:
mode:
authorandrew hendry <andrew.hendry@gmail.com>2010-09-21 15:24:25 +0000
committerDavid S. Miller <davem@davemloft.net>2010-09-22 13:35:51 -0700
commit40e192c3ff7b1af680b0b03e94cadf1dad5fb82e (patch)
treeecd92e13d0ee1c11b0c453e361018cea8f270276 /net/x25
parent7e51b439f147670c4ddd2bf6ca4567592b5312de (diff)
downloadlinux-stable-40e192c3ff7b1af680b0b03e94cadf1dad5fb82e.tar.gz
linux-stable-40e192c3ff7b1af680b0b03e94cadf1dad5fb82e.tar.bz2
linux-stable-40e192c3ff7b1af680b0b03e94cadf1dad5fb82e.zip
X.25 remove bkl in getsockname
Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/x25')
-rw-r--r--net/x25/af_x25.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index c1bbf9ec71f4..dc6767ecdaf8 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -909,7 +909,6 @@ static int x25_getname(struct socket *sock, struct sockaddr *uaddr,
struct x25_sock *x25 = x25_sk(sk);
int rc = 0;
- lock_kernel();
if (peer) {
if (sk->sk_state != TCP_ESTABLISHED) {
rc = -ENOTCONN;
@@ -923,7 +922,6 @@ static int x25_getname(struct socket *sock, struct sockaddr *uaddr,
*uaddr_len = sizeof(*sx25);
out:
- unlock_kernel();
return rc;
}