]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
X.25 remove bkl in getsockname
authorandrew hendry <andrew.hendry@gmail.com>
Tue, 21 Sep 2010 15:24:25 +0000 (15:24 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 22 Sep 2010 20:35:51 +0000 (13:35 -0700)
Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/x25/af_x25.c

index c1bbf9ec71f417acc707094b49ff7533838986ab..dc6767ecdaf823e3e9c0eb00cdc6846828f50b14 100644 (file)
@@ -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;
 }