summaryrefslogtreecommitdiffstats
path: root/net/ceph/ceph_common.c
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2013-05-01 12:43:04 -0500
committerAlex Elder <elder@inktank.com>2013-05-02 11:58:41 -0500
commit5522ae0b68421e2645303ff010e27afc5292e0ab (patch)
tree200ec4895513e032a6ce9e844a457150f22b0708 /net/ceph/ceph_common.c
parent81b36be4c56299ac4c4c786908cb117ad232b62e (diff)
downloadop-kernel-dev-5522ae0b68421e2645303ff010e27afc5292e0ab.zip
op-kernel-dev-5522ae0b68421e2645303ff010e27afc5292e0ab.tar.gz
libceph: use slab cache for osd client requests
Create a slab cache to manage allocation of ceph_osdc_request structures. This resolves: http://tracker.ceph.com/issues/3926 Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to 'net/ceph/ceph_common.c')
-rw-r--r--net/ceph/ceph_common.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
index e65e6e4..34b11ee 100644
--- a/net/ceph/ceph_common.c
+++ b/net/ceph/ceph_common.c
@@ -606,11 +606,17 @@ static int __init init_ceph_lib(void)
if (ret < 0)
goto out_crypto;
+ ret = ceph_osdc_setup();
+ if (ret < 0)
+ goto out_msgr;
+
pr_info("loaded (mon/osd proto %d/%d)\n",
CEPH_MONC_PROTOCOL, CEPH_OSDC_PROTOCOL);
return 0;
+out_msgr:
+ ceph_msgr_exit();
out_crypto:
ceph_crypto_shutdown();
out_debugfs:
@@ -622,6 +628,7 @@ out:
static void __exit exit_ceph_lib(void)
{
dout("exit_ceph_lib\n");
+ ceph_osdc_cleanup();
ceph_msgr_exit();
ceph_crypto_shutdown();
ceph_debugfs_cleanup();
OpenPOWER on IntegriCloud