summaryrefslogtreecommitdiffstats
path: root/net/rds/tcp_send.c
diff options
context:
space:
mode:
authorYing Xue <ying.xue@windriver.com>2012-08-19 23:44:08 +0200
committerDavid S. Miller <davem@davemloft.net>2012-08-23 07:52:04 +0200
commitbfdc587c5af4ff155cf702b972e8fcd66d77d5f2 (patch)
tree81bed65ce086ff013ea5b41eec17c7e1949ff0aa /net/rds/tcp_send.c
parentbonding: support for IPv6 transmit hashing (diff)
downloadlinux-bfdc587c5af4ff155cf702b972e8fcd66d77d5f2.tar.xz
linux-bfdc587c5af4ff155cf702b972e8fcd66d77d5f2.zip
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_send.c')
-rw-r--r--net/rds/tcp_send.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rds/tcp_send.c b/net/rds/tcp_send.c
index 1b4fd68f0c7c..81cf5a4c5e40 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)
struct rds_connection *conn;
struct rds_tcp_connection *tc;
- read_lock_bh(&sk->sk_callback_lock);
+ read_lock(&sk->sk_callback_lock);
conn = sk->sk_user_data;
if (!conn) {
write_space = sk->sk_write_space;
@@ -194,7 +194,7 @@ void rds_tcp_write_space(struct sock *sk)
queue_delayed_work(rds_wq, &conn->c_send_w, 0);
out:
- read_unlock_bh(&sk->sk_callback_lock);
+ read_unlock(&sk->sk_callback_lock);
/*
* write_space is only called when data leaves tcp's send queue if