From b985882aa27fea1d1ed92b09b6057be961c56c0a Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 8 Sep 2009 14:40:59 -0700
Subject: [PATCH] kclient: remove msgpools for now

---
 src/kernel/Makefile                           |  2 +-
 src/kernel/import_patch_set_into_linux_git.sh | 14 +-------------
 src/kernel/messenger.c                        |  6 +-----
 src/kernel/messenger.h                        |  2 --
 src/kernel/mon_client.c                       |  2 --
 src/kernel/super.c                            |  9 ---------
 src/kernel/super.h                            |  4 ----
 7 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/src/kernel/Makefile b/src/kernel/Makefile
index 031b85f96f9f5..ba1e6a59f651a 100644
--- a/src/kernel/Makefile
+++ b/src/kernel/Makefile
@@ -8,7 +8,7 @@ obj-$(CONFIG_CEPH_FS) += ceph.o
 
 ceph-objs := super.o inode.o dir.o file.o addr.o ioctl.o \
 	export.o caps.o snap.o \
-	messenger.o msgpool.o \
+	messenger.o \
 	mds_client.o mdsmap.o \
 	mon_client.o \
 	osd_client.o osdmap.o crush/crush.o crush/mapper.o \
diff --git a/src/kernel/import_patch_set_into_linux_git.sh b/src/kernel/import_patch_set_into_linux_git.sh
index d55e5a58f0a88..55e9b3600f886 100755
--- a/src/kernel/import_patch_set_into_linux_git.sh
+++ b/src/kernel/import_patch_set_into_linux_git.sh
@@ -298,24 +298,12 @@ ceph: messenger library
 A generic message passing library is used to communicate with all
 other components in the Ceph file system.  The messenger library
 provides ordered, reliable delivery of messages between two nodes in
-the system, or notifies the higher layer when it is unable to do so.
+the system.
 
 This implementation is based on TCP.
 
 EOF
 
-git add $target/ceph/msgpool.h
-git add $target/ceph/msgpool.c
-git commit -s -F - <<EOF
-ceph: message pools
-
-The msgpool is a basic mempool_t-like structure to preallocate
-messages we expect to receive over the wire.  This ensures we have the
-necessary memory preallocated to process replies to requests, or to
-process unsolicited messages from various servers.
-
-EOF
-
 git add $target/ceph/export.c
 git commit -s -F - <<EOF
 ceph: nfs re-export support
diff --git a/src/kernel/messenger.c b/src/kernel/messenger.c
index b60726388f08a..9d69e46fc0ba4 100644
--- a/src/kernel/messenger.c
+++ b/src/kernel/messenger.c
@@ -1689,7 +1689,6 @@ struct ceph_msg *ceph_msg_new(int type, int front_len,
 	m->front_max = front_len;
 	m->front_is_vmalloc = false;
 	m->more_to_follow = false;
-	m->pool = NULL;
 
 	/* front */
 	if (front_len) {
@@ -1811,9 +1810,6 @@ void ceph_msg_put(struct ceph_msg *m)
 		m->nr_pages = 0;
 		m->pages = NULL;
 
-		if (m->pool)
-			ceph_msgpool_put(m->pool, m);
-		else
-			ceph_msg_kfree(m);
+		ceph_msg_kfree(m);
 	}
 }
diff --git a/src/kernel/messenger.h b/src/kernel/messenger.h
index ed675f5d9a84c..5a965add550f5 100644
--- a/src/kernel/messenger.h
+++ b/src/kernel/messenger.h
@@ -101,8 +101,6 @@ struct ceph_msg {
 	bool front_is_vmalloc;
 	bool more_to_follow;
 	int front_max;
-
-	struct ceph_msg_pool *pool;
 };
 
 struct ceph_msg_pos {
diff --git a/src/kernel/mon_client.c b/src/kernel/mon_client.c
index d6b52a7fbb7fb..521c0366b255f 100644
--- a/src/kernel/mon_client.c
+++ b/src/kernel/mon_client.c
@@ -453,7 +453,6 @@ int ceph_monc_do_statfs(struct ceph_mon_client *monc, struct ceph_statfs *buf)
 		return -ENOMEM;
 	}
 	monc->num_statfs_requests++;
-	ceph_msgpool_resv(&monc->client->msgpool_statfs_reply, 1);
 	mutex_unlock(&monc->mutex);
 
 	/* send request and wait */
@@ -464,7 +463,6 @@ int ceph_monc_do_statfs(struct ceph_mon_client *monc, struct ceph_statfs *buf)
 	mutex_lock(&monc->mutex);
 	radix_tree_delete(&monc->statfs_request_tree, req.tid);
 	monc->num_statfs_requests--;
-	ceph_msgpool_resv(&monc->client->msgpool_statfs_reply, -1);
 	mutex_unlock(&monc->mutex);
 
 	if (!err)
diff --git a/src/kernel/super.c b/src/kernel/super.c
index 9378abbfd3015..386ea2838b2b1 100644
--- a/src/kernel/super.c
+++ b/src/kernel/super.c
@@ -613,12 +613,6 @@ static struct ceph_client *ceph_create_client(void)
 	if (client->trunc_wq == NULL)
 		goto fail;
 
-	/* msg pools */
-	/* preallocated at request time: */
-	err = ceph_msgpool_init(&client->msgpool_statfs_reply, 4096, 0, false);
-	if (err < 0)
-		goto fail;
-
 	/* subsystems */
 	err = ceph_monc_init(&client->monc, client);
 	if (err < 0)
@@ -656,9 +650,6 @@ static void ceph_destroy_client(struct ceph_client *client)
 	if (client->wb_pagevec_pool)
 		mempool_destroy(client->wb_pagevec_pool);
 
-	/* msg pools */
-	ceph_msgpool_destroy(&client->msgpool_statfs_reply);
-
 	release_mount_args(&client->mount_args);
 
 	kfree(client);
diff --git a/src/kernel/super.h b/src/kernel/super.h
index 8b8992dd84777..73540d053d09a 100644
--- a/src/kernel/super.h
+++ b/src/kernel/super.h
@@ -13,7 +13,6 @@
 #include "types.h"
 #include "ceph_debug.h"
 #include "messenger.h"
-#include "msgpool.h"
 #include "mon_client.h"
 #include "mds_client.h"
 #include "osd_client.h"
@@ -133,9 +132,6 @@ struct ceph_client {
 	struct ceph_mds_client mdsc;
 	struct ceph_osd_client osdc;
 
-	/* msg pools */
-	struct ceph_msg_pool msgpool_statfs_reply;
-
 	/* writeback */
 	mempool_t *wb_pagevec_pool;
 	struct workqueue_struct *wb_wq;
-- 
2.39.5