summaryrefslogtreecommitdiffstats
path: root/net/rds/tcp_recv.c
diff options
context:
space:
mode:
authorYing Xue <ying.xue@windriver.com>2012-08-19 21:44:08 +0000
committerDavid S. Miller <davem@davemloft.net>2012-08-22 22:52:04 -0700
commitbfdc587c5af4ff155cf702b972e8fcd66d77d5f2 (patch)
tree81bed65ce086ff013ea5b41eec17c7e1949ff0aa /net/rds/tcp_recv.c
parent6b923cb7188d46905f43fa84210c4c3e5f9cd8fb (diff)
downloadop-kernel-dev-bfdc587c5af4ff155cf702b972e8fcd66d77d5f2.zip
op-kernel-dev-bfdc587c5af4ff155cf702b972e8fcd66d77d5f2.tar.gz
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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rds/tcp_recv.c b/net/rds/tcp_recv.c
index 6243258..4fac4f2 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)
rdsdebug("data ready sk %p bytes %d\n", sk, bytes);
- read_lock_bh(&sk->sk_callback_lock);
+ read_lock(&sk->sk_callback_lock);
conn = sk->sk_user_data;
if (!conn) { /* check for teardown race */
ready = sk->sk_data_ready;
@@ -336,7 +336,7 @@ void rds_tcp_data_ready(struct sock *sk, int bytes)
if (rds_tcp_read_sock(conn, GFP_ATOMIC) == -ENOMEM)
queue_delayed_work(rds_wq, &conn->c_recv_w, 0);
out:
- read_unlock_bh(&sk->sk_callback_lock);
+ read_unlock(&sk->sk_callback_lock);
ready(sk, bytes);
}
OpenPOWER on IntegriCloud