2 files changed, 3 insertions, 1 deletions

diff --git a/fs/ceph/messenger.c b/fs/ceph/messenger.c
index 0ddc2c75f6b4..bf4590c77cf6 100644
--- a/fs/ceph/messenger.c
+++ b/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/fs/ceph/messenger.h b/fs/ceph/messenger.h
index c9735378be3f..4caaa5911110 100644
--- a/fs/ceph/messenger.h
+++ b/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 */