From fd692652a1d42a8a6606d1c7b3615e5332176448 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@inktank.com>
Date: Mon, 30 Jul 2012 16:22:05 -0700
Subject: [PATCH] --- yaml --- r: 320335 b: refs/heads/master c:
 85effe183dd45854d1ad1a370b88cddb403c4c91 h: refs/heads/master i:   320333:
 dc80425a0ad9470566db366e7b7873a0eeef8d78   320331:
 58fe23815fac65e5277a04484e7c35a90c5ea7fa   320327:
 ad625beb417725efa7c8fc5a55822702001c914d   320319:
 c5006ff5220de08442b32ada49eb9b0a361d0c48 v: v3

---
 [refs]                     | 2 +-
 trunk/net/ceph/messenger.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9a2c9cacf10d..a60932fe987d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5469155f2bc83bb2c88b0a0370c3d54d87eed06e
+refs/heads/master: 85effe183dd45854d1ad1a370b88cddb403c4c91
diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c
index a4779988c847..07204f19e856 100644
--- a/trunk/net/ceph/messenger.c
+++ b/trunk/net/ceph/messenger.c
@@ -1629,6 +1629,8 @@ static int process_connect(struct ceph_connection *con)
 		if (con->in_reply.flags & CEPH_MSG_CONNECT_LOSSY)
 			set_bit(LOSSYTX, &con->flags);
 
+		con->delay = 0;      /* reset backoff memory */
+
 		prepare_read_tag(con);
 		break;