aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/locking
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2006-08-04 14:14:50 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-08-07 08:46:19 -0400
commit3120ec541eafc6ed19bacb395adf08c5872143bf (patch)
treeb43b9552aa7814b45473c2da85a0b814bc562b49 /fs/gfs2/locking
parent59a1cc6bdabf5ed148b48808ad1a418d87f5e6bf (diff)
[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>
Diffstat (limited to 'fs/gfs2/locking')
-rw-r--r--fs/gfs2/locking/dlm/main.c8
-rw-r--r--fs/gfs2/locking/nolock/main.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/fs/gfs2/locking/dlm/main.c b/fs/gfs2/locking/dlm/main.c
index 89728c91665f..870a1cd99f57 100644
--- 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)
20{ 20{
21 int error; 21 int error;
22 22
23 error = gfs_register_lockproto(&gdlm_ops); 23 error = gfs2_register_lockproto(&gdlm_ops);
24 if (error) { 24 if (error) {
25 printk(KERN_WARNING "lock_dlm: can't register protocol: %d\n", 25 printk(KERN_WARNING "lock_dlm: can't register protocol: %d\n",
26 error); 26 error);
@@ -29,14 +29,14 @@ static int __init init_lock_dlm(void)
29 29
30 error = gdlm_sysfs_init(); 30 error = gdlm_sysfs_init();
31 if (error) { 31 if (error) {
32 gfs_unregister_lockproto(&gdlm_ops); 32 gfs2_unregister_lockproto(&gdlm_ops);
33 return error; 33 return error;
34 } 34 }
35 35
36 error = gdlm_plock_init(); 36 error = gdlm_plock_init();
37 if (error) { 37 if (error) {
38 gdlm_sysfs_exit(); 38 gdlm_sysfs_exit();
39 gfs_unregister_lockproto(&gdlm_ops); 39 gfs2_unregister_lockproto(&gdlm_ops);
40 return error; 40 return error;
41 } 41 }
42 42
@@ -52,7 +52,7 @@ static void __exit exit_lock_dlm(void)
52{ 52{
53 gdlm_plock_exit(); 53 gdlm_plock_exit();
54 gdlm_sysfs_exit(); 54 gdlm_sysfs_exit();
55 gfs_unregister_lockproto(&gdlm_ops); 55 gfs2_unregister_lockproto(&gdlm_ops);
56} 56}
57 57
58module_init(init_lock_dlm); 58module_init(init_lock_dlm);
diff --git a/fs/gfs2/locking/nolock/main.c b/fs/gfs2/locking/nolock/main.c
index 97ffac5cdefb..748aa5d33641 100644
--- a/fs/gfs2/locking/nolock/main.c
+++ b/fs/gfs2/locking/nolock/main.c
@@ -233,7 +233,7 @@ static int __init init_nolock(void)
233{ 233{
234 int error; 234 int error;
235 235
236 error = gfs_register_lockproto(&nolock_ops); 236 error = gfs2_register_lockproto(&nolock_ops);
237 if (error) { 237 if (error) {
238 printk(KERN_WARNING 238 printk(KERN_WARNING
239 "lock_nolock: can't register protocol: %d\n", error); 239 "lock_nolock: can't register protocol: %d\n", error);
@@ -247,7 +247,7 @@ static int __init init_nolock(void)
247 247
248static void __exit exit_nolock(void) 248static void __exit exit_nolock(void)
249{ 249{
250 gfs_unregister_lockproto(&nolock_ops); 250 gfs2_unregister_lockproto(&nolock_ops);
251} 251}
252 252
253module_init(init_nolock); 253module_init(init_nolock);