[GFS2] lockproto api prefix

Use the gfs2_ prefix on the register/unregister functions for the lock
modules.  The gfs_ prefix was left from an old idea on how to share these
with gfs1.

Signed-off-by: David Teigland <teigland@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/gfs2/lm_interface.h b/fs/gfs2/lm_interface.h
index 9d34bf3df1036ed5b9a253e7ec8427c375fbe409..1da95a55f768f3e39104565b1edf4a60f4ce31a9 100644 (file)
--- a/fs/gfs2/lm_interface.h
+++ b/fs/gfs2/lm_interface.h
@@ -265,16 +265,11 @@ void __init gfs2_init_lmh(void);
 /*
  * Lock module bottom interface.  A lock module makes itself available to GFS
  * with these functions.
- *
- * For the time being, we copy the gfs1 lock module bottom interface so the
- * same lock modules can be used with both gfs1 and gfs2 (it won't be possible
- * to load both gfs1 and gfs2 at once.)  Eventually the lock modules will fork
- * for gfs1/gfs2 and this API can change to the gfs2_ prefix.
  */
 
-int gfs_register_lockproto(struct lm_lockops *proto);
+int gfs2_register_lockproto(struct lm_lockops *proto);
 
-void gfs_unregister_lockproto(struct lm_lockops *proto);
+void gfs2_unregister_lockproto(struct lm_lockops *proto);
 
 /*
  * Lock module top interface.  GFS calls these functions when mounting or

diff --git a/fs/gfs2/locking/dlm/main.c b/fs/gfs2/locking/dlm/main.c
index 89728c91665fe9e90582730f473d20e1b9746ec8..870a1cd99f5781556822c2dfc24929b4bf1c5778 100644 (file)
--- a/fs/gfs2/locking/dlm/main.c
+++ b/fs/gfs2/locking/dlm/main.c
@@ -20,7 +20,7 @@ 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,14 +29,14 @@ 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);
+               gfs2_unregister_lockproto(&gdlm_ops);
                return error;
        }
 
@@ -52,7 +52,7 @@ 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);

diff --git a/fs/gfs2/locking/nolock/main.c b/fs/gfs2/locking/nolock/main.c
index 97ffac5cdefbe5e365875fa86eb6adda870a6f57..748aa5d3364151c661d73ab43a5aed8fc9153423 100644 (file)
--- a/fs/gfs2/locking/nolock/main.c
+++ b/fs/gfs2/locking/nolock/main.c
@@ -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);