[PATCH 132/270] libceph: drop unnecessary CLOSED check in socket state change callback

Herton Ronaldo Krzesinski herton.krzesinski at canonical.com
Mon Nov 26 16:57:02 UTC 2012

3.5.7u1 -stable review patch.  If anyone has any objections, please let me know.


From: Sage Weil <sage at inktank.com>

commit d7353dd5aaf22ed611fbcd0d4a4a12fb30659290 upstream.

If we are CLOSED, the socket is closed and we won't get these.

Signed-off-by: Sage Weil <sage at inktank.com>
Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski at canonical.com>
 net/ceph/messenger.c |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 46ce113..e7320cd 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -296,9 +296,6 @@ static void ceph_sock_state_change(struct sock *sk)
 	dout("%s %p state = %lu sk_state = %u\n", __func__,
 	     con, con->state, sk->sk_state);
-	if (test_bit(CLOSED, &con->state))
-		return;
 	switch (sk->sk_state) {
 	case TCP_CLOSE:
 		dout("%s TCP_CLOSE\n", __func__);

More information about the kernel-team mailing list