---

yaml --- r: 189195 b: refs/heads/master c: 63733a0 h: refs/heads/master i: 189193: 48d7694 189191: 0dbb309 v: v3
git-mirror · Mar 21, 2010 · b8d3774 · b8d3774
1 parent 910a4f4
commit b8d3774
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git 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
@@ -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: