[GFS2] Update copyright, tidy up incore.h

[mirror_ubuntu-bionic-kernel.git] / fs / gfs2 / locking / nolock / main.c

diff --git a/fs/gfs2/locking/nolock/main.c b/fs/gfs2/locking/nolock/main.c
index 97ffac5cdefbe5e365875fa86eb6adda870a6f57..95a29914730aec4dcc76ee2b02b87e3e4692af6b 100644 (file)
--- a/fs/gfs2/locking/nolock/main.c
+++ b/fs/gfs2/locking/nolock/main.c
@@ -4,7 +4,7 @@
  *
  * 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/module.h>
@@ -233,7 +233,7 @@ static int __init init_nolock(void)
 {
        int error;
 
-       error = gfs_register_lockproto(&nolock_ops);
+       error = gfs2_register_lockproto(&nolock_ops);
        if (error) {
                printk(KERN_WARNING
                       "lock_nolock: can't register protocol: %d\n", error);
@@ -247,7 +247,7 @@ static int __init init_nolock(void)
 
 static void __exit exit_nolock(void)
 {
-       gfs_unregister_lockproto(&nolock_ops);
+       gfs2_unregister_lockproto(&nolock_ops);
 }
 
 module_init(init_nolock);