Commit bfdc587c authored by Ying Xue's avatar Ying Xue Committed by David S. Miller
Browse files

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: default avatarYing Xue <ying.xue@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6b923cb7

net/rds/tcp_connect.c

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ void rds_tcp_state_change(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) {

		state_change = sk->sk_state_change;
@@ -68,7 +68,7 @@ void rds_tcp_state_change(struct sock *sk) 
			break;

	}

out:

	read_unlock_bh(&sk->sk_callback_lock);

	read_unlock(&sk->sk_callback_lock);

	state_change(sk);

}

net/rds/tcp_listen.c

+2 −2
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ void rds_tcp_listen_data_ready(struct sock *sk, int bytes) 


	rdsdebug("listen data ready sk %p\n", sk);



	read_lock_bh(&sk->sk_callback_lock);

	read_lock(&sk->sk_callback_lock);

	ready = sk->sk_user_data;

	if (!ready) { /* check for teardown race */

		ready = sk->sk_data_ready;
@@ -131,7 +131,7 @@ void rds_tcp_listen_data_ready(struct sock *sk, int bytes) 
		queue_work(rds_wq, &rds_tcp_listen_work);



out:

	read_unlock_bh(&sk->sk_callback_lock);

	read_unlock(&sk->sk_callback_lock);

	ready(sk, bytes);

}

net/rds/tcp_recv.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

}

net/rds/tcp_send.c

+2 −2
Original line number Diff line number Diff line
@@ -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