From 1e6ec404f1bd8e310e1dffbe88300b96573c9954 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Fri, 20 Nov 2009 15:14:15 -0800
Subject: [PATCH] --- yaml --- r: 188630 b: refs/heads/master c:
 03c677e1d189ff62891d9f278c55bb798a418b81 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 030f5d399f8a..e851b4f4db71 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0dc2570fab222affe7739b88b5ed04c511d433dc
+refs/heads/master: 03c677e1d189ff62891d9f278c55bb798a418b81
diff --git a/trunk/fs/ceph/messenger.c b/trunk/fs/ceph/messenger.c
index 0b1674854b25..45cec31fdf5e 100644
--- a/trunk/fs/ceph/messenger.c
+++ b/trunk/fs/ceph/messenger.c
@@ -348,6 +348,7 @@ void ceph_con_open(struct ceph_connection *con, struct ceph_entity_addr *addr)
 	set_bit(OPENING, &con->state);
 	clear_bit(CLOSED, &con->state);
 	memcpy(&con->peer_addr, addr, sizeof(*addr));
+	con->delay = 0;      /* reset backoff memory */
 	queue_con(con);
 }
 
@@ -1162,8 +1163,6 @@ static int process_connect(struct ceph_connection *con)
 		     con->connect_seq);
 		WARN_ON(con->connect_seq !=
 			le32_to_cpu(con->in_reply.connect_seq));
-
-		con->delay = 0;  /* reset backoff memory */
 		prepare_read_tag(con);
 		break;