diff options
Diffstat (limited to 'fs/dlm/main.c')
| -rw-r--r-- | fs/dlm/main.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/fs/dlm/main.c b/fs/dlm/main.c index eca2907f238..079c0bd71ab 100644 --- a/fs/dlm/main.c +++ b/fs/dlm/main.c @@ -17,16 +17,7 @@ #include "user.h" #include "memory.h" #include "config.h" - -#ifdef CONFIG_DLM_DEBUG -int dlm_register_debugfs(void); -void dlm_unregister_debugfs(void); -#else -static inline int dlm_register_debugfs(void) { return 0; } -static inline void dlm_unregister_debugfs(void) { } -#endif -int dlm_netlink_init(void); -void dlm_netlink_exit(void); +#include "lowcomms.h" static int __init init_dlm(void) { @@ -56,10 +47,16 @@ static int __init init_dlm(void) if (error) goto out_user; - printk("DLM (built %s %s) installed\n", __DATE__, __TIME__); + error = dlm_plock_init(); + if (error) + goto out_netlink; + + printk("DLM installed\n"); return 0; + out_netlink: + dlm_netlink_exit(); out_user: dlm_user_exit(); out_debug: @@ -76,11 +73,13 @@ static int __init init_dlm(void) static void __exit exit_dlm(void) { + dlm_plock_exit(); dlm_netlink_exit(); dlm_user_exit(); dlm_config_exit(); dlm_memory_exit(); dlm_lockspace_exit(); + dlm_lowcomms_exit(); dlm_unregister_debugfs(); } |