diff options
| author | Alex Elder <elder@inktank.com> | 2012-06-21 04:53:53 +0200 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2012-07-06 06:14:24 +0200 |
| commit | bb9e6bba5d8b85b631390f8dbe8a24ae1ff5b48a (patch) | |
| tree | e3923abfae2f2cb8af685dfb829a45df33e45779 /net | |
| parent | libceph: don't touch con state in con_close_socket() (diff) | |
| download | linux-bb9e6bba5d8b85b631390f8dbe8a24ae1ff5b48a.tar.xz linux-bb9e6bba5d8b85b631390f8dbe8a24ae1ff5b48a.zip | |
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: Alex Elder <elder@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'net')
| -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 cfcca1f5be67..beee382d784e 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"; |