From 23fc8b42993909231c764d186adc49256fcbde6c Mon Sep 17 00:00:00 2001
From: sageweil <sageweil@29311d96-e01e-0410-9327-a35deaab8ce9>
Date: Wed, 28 Nov 2007 17:17:48 +0000
Subject: [PATCH] some small messenger fixes

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@2135 29311d96-e01e-0410-9327-a35deaab8ce9
---
 trunk/ceph/kernel/client.c    | 5 +++--
 trunk/ceph/kernel/ktcp.c      | 1 -
 trunk/ceph/kernel/messenger.c | 8 ++++----
 trunk/ceph/kernel/super.c     | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/trunk/ceph/kernel/client.c b/trunk/ceph/kernel/client.c
index 9f7e716d1a3f5..b1278692c0b73 100644
--- a/trunk/ceph/kernel/client.c
+++ b/trunk/ceph/kernel/client.c
@@ -75,18 +75,19 @@ trymount:
 	mount_msg->hdr.dst.name.type = CEPH_ENTITY_TYPE_MON;
 	mount_msg->hdr.dst.name.num = which;
 	mount_msg->hdr.dst.addr = args->mon_addr[which];
-	dout(1, "mount from mon%d, %d attempts left\n", which, attempts);
+	dout(10, "mount from mon%d, %d attempts left\n", which, attempts);
 	
 	ceph_msg_send(client->msgr, mount_msg);
 
 	/* wait */
+	dout(10, "mount waiting\n");
 	err = wait_event_interruptible_timeout(client->mount_wq, 
 					       (client->mounting == 0),
 					       6*HZ);
 	if (err == -EINTR)
 		return err; 
 	if (client->mounting) {
-		dout(1, "ceph_get_client still waiting for mount, attempts=%d\n", attempts);
+		dout(10, "ceph_get_client still waiting for mount, attempts=%d\n", attempts);
 		if (--attempts)
 			goto trymount;
 		return -EIO;
diff --git a/trunk/ceph/kernel/ktcp.c b/trunk/ceph/kernel/ktcp.c
index 2228940ffcdcc..2c6692617e068 100644
--- a/trunk/ceph/kernel/ktcp.c
+++ b/trunk/ceph/kernel/ktcp.c
@@ -87,7 +87,6 @@ int ceph_tcp_connect(struct ceph_connection *con)
         /* setup callbacks */
         set_sock_callbacks(con->sock, (void *)con);
 
-
         ret = con->sock->ops->connect(con->sock, paddr,
                                       sizeof(struct sockaddr_in), O_NONBLOCK);
         if (ret == -EINPROGRESS) return 0;
diff --git a/trunk/ceph/kernel/messenger.c b/trunk/ceph/kernel/messenger.c
index bb05b10e34754..7a41ca07e9e27 100644
--- a/trunk/ceph/kernel/messenger.c
+++ b/trunk/ceph/kernel/messenger.c
@@ -140,7 +140,7 @@ static void add_connection(struct ceph_messenger *msgr, struct ceph_connection *
 	spin_lock(&msgr->con_lock);
 	head = radix_tree_lookup(&msgr->con_open, key);
 	if (head) {
-		list_add(head, &con->list_bucket);
+		list_add(&con->list_bucket, head);
 	} else {
 		INIT_LIST_HEAD(&con->list_bucket); /* empty */
 		radix_tree_insert(&msgr->con_open, key, &con->list_bucket);
@@ -152,8 +152,8 @@ static void add_connection_accepting(struct ceph_messenger *msgr, struct ceph_co
 {
 	atomic_inc(&con->nref);
 	spin_lock(&msgr->con_lock);
-	list_add(&msgr->con_all, &con->list_all);
-	list_add(&msgr->con_accepting, &con->list_bucket);
+	list_add(&con->list_all, &msgr->con_all);
+	list_add(&con->list_bucket, &msgr->con_accepting);
 	spin_unlock(&msgr->con_lock);
 }
 
@@ -774,7 +774,7 @@ int ceph_msg_send(struct ceph_messenger *msgr, struct ceph_msg *msg)
 	     ceph_name_type_str(msg->hdr.dst.name.type), msg->hdr.dst.name.num);
 	ceph_msg_get(msg);
 
-	list_add(&con->out_queue, &msg->list_head);
+	list_add(&msg->list_head, &con->out_queue);
 	set_bit(WRITE_PEND, &con->state);
 	spin_unlock(&con->con_lock);
 	put_connection(con);
diff --git a/trunk/ceph/kernel/super.c b/trunk/ceph/kernel/super.c
index d1b9a59e679ac..e306cbd9d8ace 100644
--- a/trunk/ceph/kernel/super.c
+++ b/trunk/ceph/kernel/super.c
@@ -370,7 +370,7 @@ static struct file_system_type ceph_fs_type = {
 /*	.fs_flags	=   */
 };
 
-static int __init init_ceph(void)
+int __init init_ceph(void)
 {
 	int ret = 0;
 
@@ -383,7 +383,7 @@ static int __init init_ceph(void)
 	return ret;
 }
 
-static void __exit exit_ceph(void)
+void __exit exit_ceph(void)
 {
 	dout(1, "exit_ceph\n");
 
-- 
2.39.5