LU-9859 libcfs: refactor libcfs initialization.

[fs/lustre-release.git] / libcfs / libcfs / linux / linux-prim.c

diff --git a/libcfs/libcfs/linux/linux-prim.c b/libcfs/libcfs/linux/linux-prim.c
index 8e0ee07..660d328 100644 (file)
--- a/libcfs/libcfs/linux/linux-prim.c
+++ b/libcfs/libcfs/linux/linux-prim.c
@@ -47,6 +47,7 @@
 #endif
 
 #include <lustre_compat.h>
+#include <libcfs/crypto/llcrypt.h>
 #include <libcfs/linux/linux-time.h>
 #include <libcfs/linux/linux-wait.h>
 #include <libcfs/linux/linux-misc.h>
@@ -202,7 +203,7 @@ void __init init_libcfs_vfree_atomic(void)
        }
 }
 
-void __init cfs_arch_init(void)
+int __init cfs_arch_init(void)
 {
        init_libcfs_vfree_atomic();
 
@@ -221,12 +222,15 @@ void __init cfs_arch_init(void)
                                          SLAB_PANIC | SLAB_RECLAIM_ACCOUNT,
                                          xarray_node_ctor);
 #endif
+       return llcrypt_init();
 }
 
 void __exit cfs_arch_exit(void)
 {
        /* exit_libcfs_vfree_atomic */
        flush_scheduled_work();
+
+       llcrypt_exit();
 }
 
 int cfs_kernel_write(struct file *filp, const void *buf, size_t count,