aboutsummaryrefslogtreecommitdiffstats
path: root/fs/dlm/main.c
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2008-03-14 16:09:15 -0400
committerDavid Teigland <teigland@redhat.com>2008-04-21 12:22:28 -0400
commit2402211a8389282fd2942fad4511f02c0eeeffc5 (patch)
tree853e5818a29816e642689d7e793a845d2519711b /fs/dlm/main.c
parentd44e0fc704143624b3e88fbf8fbcfda7a83fd299 (diff)
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)
46 if (error) 46 if (error)
47 goto out_user; 47 goto out_user;
48 48
49 error = dlm_plock_init();
50 if (error)
51 goto out_netlink;
52
49 printk("DLM (built %s %s) installed\n", __DATE__, __TIME__); 53 printk("DLM (built %s %s) installed\n", __DATE__, __TIME__);
50 54
51 return 0; 55 return 0;
52 56
57 out_netlink:
58 dlm_netlink_exit();
53 out_user: 59 out_user:
54 dlm_user_exit(); 60 dlm_user_exit();
55 out_debug: 61 out_debug:
@@ -66,6 +72,7 @@ static int __init init_dlm(void)
66 72
67static void __exit exit_dlm(void) 73static void __exit exit_dlm(void)
68{ 74{
75 dlm_plock_exit();
69 dlm_netlink_exit(); 76 dlm_netlink_exit();
70 dlm_user_exit(); 77 dlm_user_exit();
71 dlm_config_exit(); 78 dlm_config_exit();