---

yaml --- r: 320369 b: refs/heads/master c: 43c7427 h: refs/heads/master i: 320367: 82cd70a v: v3
git-mirror · Jul 31, 2012 · 7c2b57e · 7c2b57e
1 parent 6495d4c
commit 7c2b57e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a8616920860920abaa51193146fe36b38ef09aa
+refs/heads/master: 43c7427d100769451601b8a36988ac0528ce0124
diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c
@@ -528,6 +528,8 @@ void ceph_con_close(struct ceph_connection *con)
 	clear_bit(CON_FLAG_LOSSYTX, &con->flags); /* so we retry next connect */
 	clear_bit(CON_FLAG_KEEPALIVE_PENDING, &con->flags);
 	clear_bit(CON_FLAG_WRITE_PENDING, &con->flags);
+	clear_bit(CON_FLAG_KEEPALIVE_PENDING, &con->flags);
+	clear_bit(CON_FLAG_BACKOFF, &con->flags);
 
 	reset_connection(con);
 	con->peer_global_seq = 0;