diff options
Diffstat (limited to 'fs/dlm')
-rw-r--r-- | fs/dlm/config.c | 2 | ||||
-rw-r--r-- | fs/dlm/debug_fs.c | 2 | ||||
-rw-r--r-- | fs/dlm/lockspace.c | 2 | ||||
-rw-r--r-- | fs/dlm/memory.c | 2 | ||||
-rw-r--r-- | fs/dlm/netlink.c | 4 | ||||
-rw-r--r-- | fs/dlm/user.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/fs/dlm/config.c b/fs/dlm/config.c index 2f8e3c81bc19..c3ad1dff3b25 100644 --- a/fs/dlm/config.c +++ b/fs/dlm/config.c | |||
@@ -604,7 +604,7 @@ static struct clusters clusters_root = { | |||
604 | }, | 604 | }, |
605 | }; | 605 | }; |
606 | 606 | ||
607 | int dlm_config_init(void) | 607 | int __init dlm_config_init(void) |
608 | { | 608 | { |
609 | config_group_init(&clusters_root.subsys.su_group); | 609 | config_group_init(&clusters_root.subsys.su_group); |
610 | mutex_init(&clusters_root.subsys.su_mutex); | 610 | mutex_init(&clusters_root.subsys.su_mutex); |
diff --git a/fs/dlm/debug_fs.c b/fs/dlm/debug_fs.c index 52b11960a175..8fc24f4507a3 100644 --- a/fs/dlm/debug_fs.c +++ b/fs/dlm/debug_fs.c | |||
@@ -541,7 +541,7 @@ void dlm_delete_debug_file(struct dlm_ls *ls) | |||
541 | debugfs_remove(ls->ls_debug_locks_dentry); | 541 | debugfs_remove(ls->ls_debug_locks_dentry); |
542 | } | 542 | } |
543 | 543 | ||
544 | int dlm_register_debugfs(void) | 544 | int __init dlm_register_debugfs(void) |
545 | { | 545 | { |
546 | mutex_init(&debug_buf_lock); | 546 | mutex_init(&debug_buf_lock); |
547 | dlm_root = debugfs_create_dir("dlm", NULL); | 547 | dlm_root = debugfs_create_dir("dlm", NULL); |
diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c index b180fdc51085..b64e55e0515d 100644 --- a/fs/dlm/lockspace.c +++ b/fs/dlm/lockspace.c | |||
@@ -191,7 +191,7 @@ static int do_uevent(struct dlm_ls *ls, int in) | |||
191 | } | 191 | } |
192 | 192 | ||
193 | 193 | ||
194 | int dlm_lockspace_init(void) | 194 | int __init dlm_lockspace_init(void) |
195 | { | 195 | { |
196 | ls_count = 0; | 196 | ls_count = 0; |
197 | mutex_init(&ls_lock); | 197 | mutex_init(&ls_lock); |
diff --git a/fs/dlm/memory.c b/fs/dlm/memory.c index 65e41e5569b0..54c14c6d06cb 100644 --- a/fs/dlm/memory.c +++ b/fs/dlm/memory.c | |||
@@ -18,7 +18,7 @@ | |||
18 | static struct kmem_cache *lkb_cache; | 18 | static struct kmem_cache *lkb_cache; |
19 | 19 | ||
20 | 20 | ||
21 | int dlm_memory_init(void) | 21 | int __init dlm_memory_init(void) |
22 | { | 22 | { |
23 | int ret = 0; | 23 | int ret = 0; |
24 | 24 | ||
diff --git a/fs/dlm/netlink.c b/fs/dlm/netlink.c index 90374b848761..714593621f4f 100644 --- a/fs/dlm/netlink.c +++ b/fs/dlm/netlink.c | |||
@@ -78,7 +78,7 @@ static struct genl_ops dlm_nl_ops = { | |||
78 | .doit = user_cmd, | 78 | .doit = user_cmd, |
79 | }; | 79 | }; |
80 | 80 | ||
81 | int dlm_netlink_init(void) | 81 | int __init dlm_netlink_init(void) |
82 | { | 82 | { |
83 | int rv; | 83 | int rv; |
84 | 84 | ||
@@ -95,7 +95,7 @@ int dlm_netlink_init(void) | |||
95 | return rv; | 95 | return rv; |
96 | } | 96 | } |
97 | 97 | ||
98 | void dlm_netlink_exit(void) | 98 | void __exit dlm_netlink_exit(void) |
99 | { | 99 | { |
100 | genl_unregister_ops(&family, &dlm_nl_ops); | 100 | genl_unregister_ops(&family, &dlm_nl_ops); |
101 | genl_unregister_family(&family); | 101 | genl_unregister_family(&family); |
diff --git a/fs/dlm/user.c b/fs/dlm/user.c index 70b31b914870..ebbcf38fd33b 100644 --- a/fs/dlm/user.c +++ b/fs/dlm/user.c | |||
@@ -902,7 +902,7 @@ static struct miscdevice ctl_device = { | |||
902 | .minor = MISC_DYNAMIC_MINOR, | 902 | .minor = MISC_DYNAMIC_MINOR, |
903 | }; | 903 | }; |
904 | 904 | ||
905 | int dlm_user_init(void) | 905 | int __init dlm_user_init(void) |
906 | { | 906 | { |
907 | int error; | 907 | int error; |
908 | 908 | ||