From b4d697c1b6ecaf51351613e749795dfd2a868e54 Mon Sep 17 00:00:00 2001
From: David Teigland <teigland@redhat.com>
Date: Fri, 4 Aug 2006 13:14:50 -0500
Subject: [PATCH] --- yaml --- r: 38776 b: refs/heads/master c:
 3120ec541eafc6ed19bacb395adf08c5872143bf h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/fs/gfs2/lm_interface.h        | 9 ++-------
 trunk/fs/gfs2/locking/dlm/main.c    | 8 ++++----
 trunk/fs/gfs2/locking/nolock/main.c | 4 ++--
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 890bad2b8241..b87e9892b8a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59a1cc6bdabf5ed148b48808ad1a418d87f5e6bf
+refs/heads/master: 3120ec541eafc6ed19bacb395adf08c5872143bf
diff --git a/trunk/fs/gfs2/lm_interface.h b/trunk/fs/gfs2/lm_interface.h
index 9d34bf3df103..1da95a55f768 100644
--- a/trunk/fs/gfs2/lm_interface.h
+++ b/trunk/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/trunk/fs/gfs2/locking/dlm/main.c b/trunk/fs/gfs2/locking/dlm/main.c
index 89728c91665f..870a1cd99f57 100644
--- a/trunk/fs/gfs2/locking/dlm/main.c
+++ b/trunk/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/trunk/fs/gfs2/locking/nolock/main.c b/trunk/fs/gfs2/locking/nolock/main.c
index 97ffac5cdefb..748aa5d33641 100644
--- a/trunk/fs/gfs2/locking/nolock/main.c
+++ b/trunk/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);