Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[pandora-kernel.git] / fs / dlm / main.c

diff --git a/fs/dlm/main.c b/fs/dlm/main.c
index a8da8dc..eca2907 100644 (file)
--- 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
@@ -16,7 +16,6 @@
 #include "lock.h"
 #include "user.h"
 #include "memory.h"
-#include "lowcomms.h"
 #include "config.h"
 
 #ifdef CONFIG_DLM_DEBUG
@@ -26,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)
 {
@@ -47,20 +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_user_init();
+       error = dlm_netlink_init();
        if (error)
-               goto out_lowcomms;
+               goto out_user;
 
        printk("DLM (built %s %s) installed\n", __DATE__, __TIME__);
 
        return 0;
 
- out_lowcomms:
-       dlm_lowcomms_exit();
+ out_user:
+       dlm_user_exit();
  out_debug:
        dlm_unregister_debugfs();
  out_config:
@@ -75,8 +76,8 @@ static int __init init_dlm(void)
 
 static void __exit exit_dlm(void)
 {
+       dlm_netlink_exit();
        dlm_user_exit();
-       dlm_lowcomms_exit();
        dlm_config_exit();
        dlm_memory_exit();
        dlm_lockspace_exit();