Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb9e6bba authored by Alex Elder's avatar Alex Elder Committed by Sage Weil
Browse files

libceph: clear CONNECTING in ceph_con_close() 



A connection that is closed will no longer be connecting.  So
clear the CONNECTING state bit in ceph_con_close().  Similarly,
if the socket has been closed we no longer are in connecting
state (a new connect sequence will need to be initiated).

Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarSage Weil <sage@inktank.com>
parent 456ea468

net/ceph/messenger.c

+2 −1
Original line number Diff line number Diff line
@@ -462,6 +462,7 @@ void ceph_con_close(struct ceph_connection *con) 
	dout("con_close %p peer %s\n", con,

	     ceph_pr_addr(&con->peer_addr.in_addr));

	clear_bit(NEGOTIATING, &con->state);

	clear_bit(CONNECTING, &con->state);

	clear_bit(STANDBY, &con->state);  /* avoid connect_seq bump */

	set_bit(CLOSED, &con->state);
@@ -2189,7 +2190,7 @@ static void con_work(struct work_struct *work) 
	mutex_lock(&con->mutex);

restart:

	if (test_and_clear_bit(SOCK_CLOSED, &con->flags)) {

		if (test_bit(CONNECTING, &con->state))

		if (test_and_clear_bit(CONNECTING, &con->state))

			con->error_msg = "connection failed";

		else

			con->error_msg = "socket closed";