git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
[pandora-kernel.git]
/
net
/
rds
/
tcp_connect.c
diff --git
a/net/rds/tcp_connect.c
b/net/rds/tcp_connect.c
index
c397524
..
c519939
100644
(file)
--- a/
net/rds/tcp_connect.c
+++ b/
net/rds/tcp_connect.c
@@
-43,7
+43,7
@@
void rds_tcp_state_change(struct sock *sk)
struct rds_connection *conn;
struct rds_tcp_connection *tc;
struct rds_connection *conn;
struct rds_tcp_connection *tc;
- read_lock(&sk->sk_callback_lock);
+ read_lock
_bh
(&sk->sk_callback_lock);
conn = sk->sk_user_data;
if (conn == NULL) {
state_change = sk->sk_state_change;
conn = sk->sk_user_data;
if (conn == NULL) {
state_change = sk->sk_state_change;
@@
-68,7
+68,7
@@
void rds_tcp_state_change(struct sock *sk)
break;
}
out:
break;
}
out:
- read_unlock(&sk->sk_callback_lock);
+ read_unlock
_bh
(&sk->sk_callback_lock);
state_change(sk);
}
state_change(sk);
}