diff options
author | Ying Xue <ying.xue@windriver.com> | 2012-08-19 17:44:08 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-08-23 01:52:04 -0400 |
commit | bfdc587c5af4ff155cf702b972e8fcd66d77d5f2 (patch) | |
tree | 81bed65ce086ff013ea5b41eec17c7e1949ff0aa /net/rds/tcp_recv.c | |
parent | 6b923cb7188d46905f43fa84210c4c3e5f9cd8fb (diff) |
rds: Don't disable BH on BH context
Since we have already in BH context when *_write_space(),
*_data_ready() as well as *_state_change() are called, it's
unnecessary to disable BH.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rds/tcp_recv.c')
-rw-r--r-- | net/rds/tcp_recv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rds/tcp_recv.c b/net/rds/tcp_recv.c index 6243258f840f..4fac4f2bb9dc 100644 --- a/net/rds/tcp_recv.c +++ b/net/rds/tcp_recv.c | |||
@@ -322,7 +322,7 @@ void rds_tcp_data_ready(struct sock *sk, int bytes) | |||
322 | 322 | ||
323 | rdsdebug("data ready sk %p bytes %d\n", sk, bytes); | 323 | rdsdebug("data ready sk %p bytes %d\n", sk, bytes); |
324 | 324 | ||
325 | read_lock_bh(&sk->sk_callback_lock); | 325 | read_lock(&sk->sk_callback_lock); |
326 | conn = sk->sk_user_data; | 326 | conn = sk->sk_user_data; |
327 | if (!conn) { /* check for teardown race */ | 327 | if (!conn) { /* check for teardown race */ |
328 | ready = sk->sk_data_ready; | 328 | ready = sk->sk_data_ready; |
@@ -336,7 +336,7 @@ void rds_tcp_data_ready(struct sock *sk, int bytes) | |||
336 | if (rds_tcp_read_sock(conn, GFP_ATOMIC) == -ENOMEM) | 336 | if (rds_tcp_read_sock(conn, GFP_ATOMIC) == -ENOMEM) |
337 | queue_delayed_work(rds_wq, &conn->c_recv_w, 0); | 337 | queue_delayed_work(rds_wq, &conn->c_recv_w, 0); |
338 | out: | 338 | out: |
339 | read_unlock_bh(&sk->sk_callback_lock); | 339 | read_unlock(&sk->sk_callback_lock); |
340 | ready(sk, bytes); | 340 | ready(sk, bytes); |
341 | } | 341 | } |
342 | 342 | ||