From 9328a948d3ce2aaabe23e5ade77787c8b034e918 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 1 Apr 2008 15:03:14 -0700
Subject: [PATCH] kmsgr: change peer_reset callback prototype

---
 src/kernel/client.c    | 15 ++++++---------
 src/kernel/messenger.c |  5 +++--
 src/kernel/messenger.h |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/kernel/client.c b/src/kernel/client.c
index 2504c0af9e867..a549a4350952a 100644
--- a/src/kernel/client.c
+++ b/src/kernel/client.c
@@ -14,7 +14,7 @@ int ceph_client_debug = 50;
 
 
 void ceph_dispatch(void *p, struct ceph_msg *msg);
-void ceph_peer_reset(void *c);
+void ceph_peer_reset(void *p, struct ceph_entity_name *peer_name);
 
 
 /*
@@ -322,15 +322,12 @@ const char *ceph_msg_type_name(int type)
 	return "unknown";
 }
 
-void ceph_peer_reset(void *c)
+void ceph_peer_reset(void *p, struct ceph_entity_name *peer_name)
 {
-	struct ceph_connection *con = c;
-
+	struct ceph_client *client = p;
+	
 	dout(30, "ceph_peer_reset peer_name = %s%d\n", 
-	     ceph_name_type_str(le32_to_cpu(con->peer_name.type)), 
-	     le32_to_cpu(con->peer_name.num));
+	     ceph_name_type_str(peer_name->type), le32_to_cpu(peer_name->num));
 
-	con->connect_seq = con->peer_connect_seq;
-	
-	return;
+	/* write me */
 }
diff --git a/src/kernel/messenger.c b/src/kernel/messenger.c
index 506a1f407d61d..991bc158952ef 100644
--- a/src/kernel/messenger.c
+++ b/src/kernel/messenger.c
@@ -836,7 +836,7 @@ static void process_connect(struct ceph_connection *con)
 		     le32_to_cpu(con->in_connect_seq));
 		reset_connection(con);
 		prepare_write_connect(con->msgr, con);
-		con->msgr->peer_reset(con);
+		con->msgr->peer_reset(con->msgr->parent, &con->peer_name);
 		break;
 	case CEPH_MSGR_TAG_RETRY:
 		dout(10, 
@@ -951,7 +951,8 @@ static void process_accept(struct ceph_connection *con)
 				reset_connection(existing);
 				/* replace connection */
 				__replace_connection(msgr, existing, con);
-				msgr->peer_reset(con);
+				con->msgr->peer_reset(con->msgr->parent, 
+						      &con->peer_name);
 			} else {
 				/* old attempt or peer didn't get the READY */
 				/* send retry with peers connect seq */
diff --git a/src/kernel/messenger.h b/src/kernel/messenger.h
index 74c8604e59fbf..fc0995f63018a 100644
--- a/src/kernel/messenger.h
+++ b/src/kernel/messenger.h
@@ -11,7 +11,7 @@
 struct ceph_msg;
 
 typedef void (*ceph_msgr_dispatch_t) (void *p, struct ceph_msg *m);
-typedef void (*ceph_msgr_peer_reset_t) (void *c);
+typedef void (*ceph_msgr_peer_reset_t) (void *p, struct ceph_entity_name *pn);
 typedef int (*ceph_msgr_prepare_pages_t) (void *p, struct ceph_msg *m, int want);
 
 static __inline__ const char *ceph_name_type_str(int t) {
-- 
2.39.5