OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
141646c
)
X.25 remove bkl in connect
author
andrew hendry
<andrew.hendry@gmail.com>
Tue, 14 Sep 2010 13:32:03 +0000
(13:32 +0000)
committer
David S. Miller
<davem@davemloft.net>
Wed, 15 Sep 2010 03:39:09 +0000
(20:39 -0700)
Connect already has socket locking.
Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/x25/af_x25.c
patch
|
blob
|
history
diff --git
a/net/x25/af_x25.c
b/net/x25/af_x25.c
index
04321ee
..
c1bbf9e
100644
(file)
--- 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;
}