Move the setting of the CONNECTING state in a ceph connection
all the way back to where a connection first gets opened. At
that point the connection's socket pointer is still null, and
the connection sequence is about to begin.
Signed-off-by: Alex Elder <elder@xxxxxxxxxxx>
---
net/ceph/messenger.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Index: b/net/ceph/messenger.c
===================================================================
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -533,6 +533,7 @@ void ceph_con_open(struct ceph_connectio
dout("con_open %p %s\n", con, ceph_pr_addr(&addr->in_addr));
set_bit(OPENING, &con->state);
WARN_ON(!test_and_clear_bit(CLOSED, &con->state));
+ set_bit(CONNECTING, &con->state);
memcpy(&con->peer_addr, addr, sizeof(*addr));
con->delay = 0; /* reset backoff memory */
@@ -1981,8 +1982,6 @@ static void process_message(struct ceph_
*/
static int ceph_con_connect(struct ceph_connection *con)
{
- set_bit(CONNECTING, &con->state);
-
con_out_kvec_reset(con);
prepare_write_banner(con);
prepare_read_banner(con);
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
