X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fdlm%2Fmain.c;h=eca2907f2386da93396d19d5195bd59101614b54;hb=c548f08a4f7b89b93c805e0c4024b8302afa7121;hp=81bf4cb2203344454a83a292f0483d04ab7801a9;hpb=9a21247181d93fdf99255911845ecdb041d21583;p=linux-2.6

diff --git a/fs/dlm/main.c b/fs/dlm/main.c
index 81bf4cb220..eca2907f23 100644
--- a/fs/dlm/main.c
+++ b/fs/dlm/main.c
@@ -2,7 +2,7 @@
 *******************************************************************************
 **
 **  Copyright (C) Sistina Software, Inc.  1997-2003  All rights reserved.
-**  Copyright (C) 2004-2005 Red Hat, Inc.  All rights reserved.
+**  Copyright (C) 2004-2007 Red Hat, Inc.  All rights reserved.
 **
 **  This copyrighted material is made available to anyone wishing to use,
 **  modify, copy, or redistribute it subject to the terms and conditions
@@ -14,8 +14,8 @@
 #include "dlm_internal.h"
 #include "lockspace.h"
 #include "lock.h"
+#include "user.h"
 #include "memory.h"
-#include "lowcomms.h"
 #include "config.h"
 
 #ifdef CONFIG_DLM_DEBUG
@@ -25,6 +25,8 @@ void dlm_unregister_debugfs(void);
 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);
 
 static int __init init_dlm(void)
 {
@@ -46,14 +48,20 @@ static int __init init_dlm(void)
 	if (error)
 		goto out_config;
 
-	error = dlm_lowcomms_init();
+	error = dlm_user_init();
 	if (error)
 		goto out_debug;
 
+	error = dlm_netlink_init();
+	if (error)
+		goto out_user;
+
 	printk("DLM (built %s %s) installed\n", __DATE__, __TIME__);
 
 	return 0;
 
+ out_user:
+	dlm_user_exit();
  out_debug:
 	dlm_unregister_debugfs();
  out_config:
@@ -68,7 +76,8 @@ static int __init init_dlm(void)
 
 static void __exit exit_dlm(void)
 {
-	dlm_lowcomms_exit();
+	dlm_netlink_exit();
+	dlm_user_exit();
 	dlm_config_exit();
 	dlm_memory_exit();
 	dlm_lockspace_exit();