summaryrefslogtreecommitdiff
path: root/fs/dlm/main.c
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2008-03-14 23:09:15 +0300
committerDavid Teigland <teigland@redhat.com>2008-04-21 20:22:28 +0400
commit2402211a8389282fd2942fad4511f02c0eeeffc5 (patch)
tree853e5818a29816e642689d7e793a845d2519711b /fs/dlm/main.c
parentd44e0fc704143624b3e88fbf8fbcfda7a83fd299 (diff)
downloadlinux-2402211a8389282fd2942fad4511f02c0eeeffc5.tar.xz
dlm: move plock code from gfs2
Move the code that handles cluster posix locks from gfs2 into the dlm so that it can be used by both gfs2 and ocfs2. Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm/main.c')
-rw-r--r--fs/dlm/main.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/dlm/main.c b/fs/dlm/main.c
index 58487fb95a4c..b80e0aa3cfa5 100644
--- a/fs/dlm/main.c
+++ b/fs/dlm/main.c
@@ -46,10 +46,16 @@ static int __init init_dlm(void)
if (error)
goto out_user;
+ error = dlm_plock_init();
+ if (error)
+ goto out_netlink;
+
printk("DLM (built %s %s) installed\n", __DATE__, __TIME__);
return 0;
+ out_netlink:
+ dlm_netlink_exit();
out_user:
dlm_user_exit();
out_debug:
@@ -66,6 +72,7 @@ static int __init init_dlm(void)
static void __exit exit_dlm(void)
{
+ dlm_plock_exit();
dlm_netlink_exit();
dlm_user_exit();
dlm_config_exit();