Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[sfrench/cifs-2.6.git] / fs / gfs2 / locking / dlm / main.c

diff --git a/fs/gfs2/locking/dlm/main.c b/fs/gfs2/locking/dlm/main.c
index 89728c91665fe9e90582730f473d20e1b9746ec8..b9a03a7ff8012efd53fbba9af7114976fa138500 100644 (file)
--- a/fs/gfs2/locking/dlm/main.c
+++ b/fs/gfs2/locking/dlm/main.c
@@ -4,23 +4,18 @@
  *
  * This copyrighted material is made available to anyone wishing to use,
  * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
+ * of the GNU General Public License version 2.
  */
 
 #include <linux/init.h>
 
 #include "lock_dlm.h"
 
-extern int gdlm_drop_count;
-extern int gdlm_drop_period;
-
-extern struct lm_lockops gdlm_ops;
-
 static int __init init_lock_dlm(void)
 {
        int error;
 
-       error = gfs_register_lockproto(&gdlm_ops);
+       error = gfs2_register_lockproto(&gdlm_ops);
        if (error) {
                printk(KERN_WARNING "lock_dlm:  can't register protocol: %d\n",
                       error);
@@ -29,20 +24,10 @@ static int __init init_lock_dlm(void)
 
        error = gdlm_sysfs_init();
        if (error) {
-               gfs_unregister_lockproto(&gdlm_ops);
+               gfs2_unregister_lockproto(&gdlm_ops);
                return error;
        }
 
-       error = gdlm_plock_init();
-       if (error) {
-               gdlm_sysfs_exit();
-               gfs_unregister_lockproto(&gdlm_ops);
-               return error;
-       }
-
-       gdlm_drop_count = GDLM_DROP_COUNT;
-       gdlm_drop_period = GDLM_DROP_PERIOD;
-
        printk(KERN_INFO
               "Lock_DLM (built %s %s) installed\n", __DATE__, __TIME__);
        return 0;
@@ -50,9 +35,8 @@ static int __init init_lock_dlm(void)
 
 static void __exit exit_lock_dlm(void)
 {
-       gdlm_plock_exit();
        gdlm_sysfs_exit();
-       gfs_unregister_lockproto(&gdlm_ops);
+       gfs2_unregister_lockproto(&gdlm_ops);
 }
 
 module_init(init_lock_dlm);