diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-27 04:03:03 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-27 04:03:03 -0400 |
| commit | e40051d134f7ee95c8c1f7a3471e84eafc9ab326 (patch) | |
| tree | 88eb44e49a75721ae926665a2c42f08badac9d07 /net/rds/tcp_send.c | |
| parent | 42099d7a3941d4aaf853caac92b3ae76149fc6e7 (diff) | |
| parent | 2cc6d2bf3d6195fabcf0febc192c01f99519a8f3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/qlcnic/qlcnic_init.c
net/ipv4/ip_output.c
Diffstat (limited to 'net/rds/tcp_send.c')
| -rw-r--r-- | net/rds/tcp_send.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rds/tcp_send.c b/net/rds/tcp_send.c index 2979fb4a4b9a..aa16841afbdf 100644 --- a/net/rds/tcp_send.c +++ b/net/rds/tcp_send.c | |||
| @@ -174,7 +174,7 @@ void rds_tcp_write_space(struct sock *sk) | |||
| 174 | struct rds_connection *conn; | 174 | struct rds_connection *conn; |
| 175 | struct rds_tcp_connection *tc; | 175 | struct rds_tcp_connection *tc; |
| 176 | 176 | ||
| 177 | read_lock(&sk->sk_callback_lock); | 177 | read_lock_bh(&sk->sk_callback_lock); |
| 178 | conn = sk->sk_user_data; | 178 | conn = sk->sk_user_data; |
| 179 | if (!conn) { | 179 | if (!conn) { |
| 180 | write_space = sk->sk_write_space; | 180 | write_space = sk->sk_write_space; |
| @@ -194,7 +194,7 @@ void rds_tcp_write_space(struct sock *sk) | |||
| 194 | queue_delayed_work(rds_wq, &conn->c_send_w, 0); | 194 | queue_delayed_work(rds_wq, &conn->c_send_w, 0); |
| 195 | 195 | ||
| 196 | out: | 196 | out: |
| 197 | read_unlock(&sk->sk_callback_lock); | 197 | read_unlock_bh(&sk->sk_callback_lock); |
| 198 | 198 | ||
| 199 | /* | 199 | /* |
| 200 | * write_space is only called when data leaves tcp's send queue if | 200 | * write_space is only called when data leaves tcp's send queue if |