From b8d37744379b69c208d446f22cc0cbf82aa62b6d Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Mon, 15 Mar 2010 15:47:22 -0700
Subject: [PATCH] --- yaml --- r: 189195 b: refs/heads/master c:
 63733a0fc55cca74b1911769633dc5dfd1a45907 h: refs/heads/master i:   189193:
 48d7694e00a569ec4162a93e53de7e1b3588b104   189191:
 0dbb3095565beebe24b562c8ec3c8697ae318ca0 v: v3

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

diff --git a/[refs] b/[refs]
index 9d153242eb00..74d629f3f4f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b218b8a4a65bf4e304ae8690cadb9100ef029c0
+refs/heads/master: 63733a0fc55cca74b1911769633dc5dfd1a45907
diff --git a/trunk/fs/ceph/messenger.c b/trunk/fs/ceph/messenger.c
index 781656a49bf8..203c4359b549 100644
--- a/trunk/fs/ceph/messenger.c
+++ b/trunk/fs/ceph/messenger.c
@@ -830,13 +830,6 @@ static void prepare_read_connect(struct ceph_connection *con)
 	con->in_base_pos = 0;
 }
 
-static void prepare_read_connect_retry(struct ceph_connection *con)
-{
-	dout("prepare_read_connect_retry %p\n", con);
-	con->in_base_pos = strlen(CEPH_BANNER) + sizeof(con->actual_peer_addr)
-		+ sizeof(con->peer_addr_for_me);
-}
-
 static void prepare_read_ack(struct ceph_connection *con)
 {
 	dout("prepare_read_ack %p\n", con);
@@ -1146,7 +1139,7 @@ static int process_connect(struct ceph_connection *con)
 		}
 		con->auth_retry = 1;
 		prepare_write_connect(con->msgr, con, 0);
-		prepare_read_connect_retry(con);
+		prepare_read_connect(con);
 		break;
 
 	case CEPH_MSGR_TAG_RESETSESSION: