Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[karo-tx-linux.git] / net / ceph / ceph_common.c

diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
index e65e6e4be38be72cff529e7d5019c908dd8f3961..34b11ee8124ee9b04a7026063b9159e6ce864be2 100644 (file)
--- 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();