libceph: fully initialize connection in con_init()

Move the initialization of a ceph connection's private pointer,
operations vector pointer, and peer name information into
ceph_con_init().  Rearrange the arguments so the connection pointer
is first.  Hide the byte-swapping of the peer entity number inside
ceph_con_init()

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>

1 files changed, 8 insertions, 1 deletions

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 36b440a00cc2..3b65f6e6911b 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -521,15 +521,22 @@ void ceph_con_put(struct ceph_connection *con)
 /*
  * initialize a new connection.
  */
-void ceph_con_init(struct ceph_messenger *msgr, struct ceph_connection *con)
+void ceph_con_init(struct ceph_connection *con, void *private,
+        const struct ceph_connection_operations *ops,
+        struct ceph_messenger *msgr, __u8 entity_type, __u64 entity_num)
 {
         dout("con_init %p\n", con);
         memset(con, 0, sizeof(*con));
+        con->private = private;
+        con->ops = ops;
         atomic_set(&con->nref, 1);
         con->msgr = msgr;
 
         con_sock_state_init(con);
 
+        con->peer_name.type = (__u8) entity_type;
+        con->peer_name.num = cpu_to_le64(entity_num);
+
         mutex_init(&con->mutex);
         INIT_LIST_HEAD(&con->out_queue);
         INIT_LIST_HEAD(&con->out_sent);