---

yaml
---
r: 38776
b: refs/heads/master
c: 3120ec5
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59a1cc6bdabf5ed148b48808ad1a418d87f5e6bf
+refs/heads/master: 3120ec541eafc6ed19bacb395adf08c5872143bf

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

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);

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);