From 7c2b57efd386a3d6fabbe6ec49e254bde59c200f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 20 Jul 2012 17:30:40 -0700 Subject: [PATCH] --- yaml --- r: 320369 b: refs/heads/master c: 43c7427d100769451601b8a36988ac0528ce0124 h: refs/heads/master i: 320367: 82cd70a69047d38521d69c26bf34894b01241be6 v: v3 --- [refs] | 2 +- trunk/net/ceph/messenger.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index de9b1995d4a1..eb7f07cc8536 100644 --- 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 index b872db5c4989..fa16f2cc35fe 100644 --- 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;