From 90ef2ec892a64133f39ee40615bbecb113afa775 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 26 Feb 2010 13:55:51 -0800 Subject: [PATCH] --- yaml --- r: 188736 b: refs/heads/master c: 1679f876a641d209e7b22e43ebda0693c71003cf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ceph/messenger.c | 3 +++ trunk/fs/ceph/messenger.h | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9affde3c34bb..f1fa1c0c2a69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 080af17e9c6360c5a835528e8de3141a46273ed2 +refs/heads/master: 1679f876a641d209e7b22e43ebda0693c71003cf diff --git a/trunk/fs/ceph/messenger.c b/trunk/fs/ceph/messenger.c index 0ddc2c75f6b4..bf4590c77cf6 100644 --- a/trunk/fs/ceph/messenger.c +++ b/trunk/fs/ceph/messenger.c @@ -342,6 +342,9 @@ void ceph_con_close(struct ceph_connection *con) dout("con_close %p peer %s\n", con, pr_addr(&con->peer_addr.in_addr)); set_bit(CLOSED, &con->state); /* in case there's queued work */ clear_bit(STANDBY, &con->state); /* avoid connect_seq bump */ + clear_bit(LOSSYTX, &con->state); /* so we retry next connect */ + clear_bit(KEEPALIVE_PENDING, &con->state); + clear_bit(WRITE_PENDING, &con->state); mutex_lock(&con->mutex); reset_connection(con); cancel_delayed_work(&con->work); diff --git a/trunk/fs/ceph/messenger.h b/trunk/fs/ceph/messenger.h index c9735378be3f..4caaa5911110 100644 --- a/trunk/fs/ceph/messenger.h +++ b/trunk/fs/ceph/messenger.h @@ -119,7 +119,6 @@ struct ceph_msg_pos { * state with the peer. */ #define CLOSED 10 /* we've closed the connection */ #define SOCK_CLOSED 11 /* socket state changed to closed */ -#define REGISTERED 12 /* connection appears in con_tree */ #define OPENING 13 /* open connection w/ (possibly new) peer */ #define DEAD 14 /* dead, about to kfree */