kmsgr: change peer_reset callback prototype

diff --git a/src/kernel/client.c b/src/kernel/client.c
index 2504c0af9e8673e7fff5a32dd67ad1b3d66f56da..a549a4350952a003f71d5ac29c85f32021eedd5d 100644 (file)
--- 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 506a1f407d61da37633de28bc7ffb43817690939..991bc158952ef50a8e10bf52ab23362186eddbe1 100644 (file)
--- 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 74c8604e59fbf46584f29b61cee11c17f7ef0af3..fc0995f63018aba3f76239050a2c8e36c00c2ddf 100644 (file)
--- 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) {