diff options
| author | Alex Elder <elder@inktank.com> | 2012-06-20 21:53:53 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-26 11:38:27 -0800 |
| commit | 2a281c7aa696af085db44154d053a169e4b07449 (patch) | |
| tree | aa7d31e193a964f885e66e0ff1083786a60f5d64 | |
| parent | 8a62c3339d5455c46c1da1e9fb9b60df20e59905 (diff) | |
| download | lwn-2a281c7aa696af085db44154d053a169e4b07449.tar.gz lwn-2a281c7aa696af085db44154d053a169e4b07449.zip | |
libceph: clear CONNECTING in ceph_con_close()
(cherry picked from commit bb9e6bba5d8b85b631390f8dbe8a24ae1ff5b48a)
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/ceph/messenger.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 8edd3052d344..7d3ce898e6d0 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -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"; |