evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libceph: clear CONNECTING in ceph_con_close()

Browse source 
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: Alex Elder <elder@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Alex Elder 2012-06-20 21:53:53 -05:00 • committed by Sage Weil
parent 456ea46865
commit bb9e6bba5d
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/ceph/messenger.c
View file

@ -462,6 +462,7 @@ void ceph_con_close(struct ceph_connection *con)
dout("con_close %p peer %s\n", con, dout("con_close %p peer %s\n", con,
ceph_pr_addr(&con->peer_addr.in_addr)); ceph_pr_addr(&con->peer_addr.in_addr));
clear_bit(NEGOTIATING, &con->state); clear_bit(NEGOTIATING, &con->state);
clear_bit(CONNECTING, &con->state);
clear_bit(STANDBY, &con->state); /* avoid connect_seq bump */ clear_bit(STANDBY, &con->state); /* avoid connect_seq bump */
set_bit(CLOSED, &con->state); set_bit(CLOSED, &con->state);
@ -2189,7 +2190,7 @@ static void con_work(struct work_struct *work)
mutex_lock(&con->mutex); mutex_lock(&con->mutex);
restart: restart:
if (test_and_clear_bit(SOCK_CLOSED, &con->flags)) { 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"; con->error_msg = "connection failed";
else else
con->error_msg = "socket closed"; con->error_msg = "socket closed";