[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>
This commit is contained in:
parent
59a1cc6bda
commit
3120ec541e
|
@ -265,16 +265,11 @@ void __init gfs2_init_lmh(void);
|
||||||
/*
|
/*
|
||||||
* Lock module bottom interface. A lock module makes itself available to GFS
|
* Lock module bottom interface. A lock module makes itself available to GFS
|
||||||
* with these functions.
|
* 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
|
* Lock module top interface. GFS calls these functions when mounting or
|
||||||
|
|
|
@ -20,7 +20,7 @@ static int __init init_lock_dlm(void)
|
||||||
{
|
{
|
||||||
int error;
|
int error;
|
||||||
|
|
||||||
error = gfs_register_lockproto(&gdlm_ops);
|
error = gfs2_register_lockproto(&gdlm_ops);
|
||||||
if (error) {
|
if (error) {
|
||||||
printk(KERN_WARNING "lock_dlm: can't register protocol: %d\n",
|
printk(KERN_WARNING "lock_dlm: can't register protocol: %d\n",
|
||||||
error);
|
error);
|
||||||
|
@ -29,14 +29,14 @@ static int __init init_lock_dlm(void)
|
||||||
|
|
||||||
error = gdlm_sysfs_init();
|
error = gdlm_sysfs_init();
|
||||||
if (error) {
|
if (error) {
|
||||||
gfs_unregister_lockproto(&gdlm_ops);
|
gfs2_unregister_lockproto(&gdlm_ops);
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
error = gdlm_plock_init();
|
error = gdlm_plock_init();
|
||||||
if (error) {
|
if (error) {
|
||||||
gdlm_sysfs_exit();
|
gdlm_sysfs_exit();
|
||||||
gfs_unregister_lockproto(&gdlm_ops);
|
gfs2_unregister_lockproto(&gdlm_ops);
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -52,7 +52,7 @@ static void __exit exit_lock_dlm(void)
|
||||||
{
|
{
|
||||||
gdlm_plock_exit();
|
gdlm_plock_exit();
|
||||||
gdlm_sysfs_exit();
|
gdlm_sysfs_exit();
|
||||||
gfs_unregister_lockproto(&gdlm_ops);
|
gfs2_unregister_lockproto(&gdlm_ops);
|
||||||
}
|
}
|
||||||
|
|
||||||
module_init(init_lock_dlm);
|
module_init(init_lock_dlm);
|
||||||
|
|
|
@ -233,7 +233,7 @@ static int __init init_nolock(void)
|
||||||
{
|
{
|
||||||
int error;
|
int error;
|
||||||
|
|
||||||
error = gfs_register_lockproto(&nolock_ops);
|
error = gfs2_register_lockproto(&nolock_ops);
|
||||||
if (error) {
|
if (error) {
|
||||||
printk(KERN_WARNING
|
printk(KERN_WARNING
|
||||||
"lock_nolock: can't register protocol: %d\n", error);
|
"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)
|
static void __exit exit_nolock(void)
|
||||||
{
|
{
|
||||||
gfs_unregister_lockproto(&nolock_ops);
|
gfs2_unregister_lockproto(&nolock_ops);
|
||||||
}
|
}
|
||||||
|
|
||||||
module_init(init_nolock);
|
module_init(init_nolock);
|
||||||
|
|
Loading…
Reference in a new issue