diff options
Diffstat (limited to 'fs/dlm')
-rw-r--r-- | fs/dlm/config.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/dlm/config.c b/fs/dlm/config.c index 4348cb42cf17..2f8e3c81bc19 100644 --- a/fs/dlm/config.c +++ b/fs/dlm/config.c | |||
@@ -607,7 +607,7 @@ static struct clusters clusters_root = { | |||
607 | int dlm_config_init(void) | 607 | int 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 | init_MUTEX(&clusters_root.subsys.su_sem); | 610 | mutex_init(&clusters_root.subsys.su_mutex); |
611 | return configfs_register_subsystem(&clusters_root.subsys); | 611 | return configfs_register_subsystem(&clusters_root.subsys); |
612 | } | 612 | } |
613 | 613 | ||
@@ -751,9 +751,9 @@ static struct space *get_space(char *name) | |||
751 | if (!space_list) | 751 | if (!space_list) |
752 | return NULL; | 752 | return NULL; |
753 | 753 | ||
754 | down(&space_list->cg_subsys->su_sem); | 754 | mutex_lock(&space_list->cg_subsys->su_mutex); |
755 | i = config_group_find_item(space_list, name); | 755 | i = config_group_find_item(space_list, name); |
756 | up(&space_list->cg_subsys->su_sem); | 756 | mutex_unlock(&space_list->cg_subsys->su_mutex); |
757 | 757 | ||
758 | return to_space(i); | 758 | return to_space(i); |
759 | } | 759 | } |
@@ -772,7 +772,7 @@ static struct comm *get_comm(int nodeid, struct sockaddr_storage *addr) | |||
772 | if (!comm_list) | 772 | if (!comm_list) |
773 | return NULL; | 773 | return NULL; |
774 | 774 | ||
775 | down(&clusters_root.subsys.su_sem); | 775 | mutex_lock(&clusters_root.subsys.su_mutex); |
776 | 776 | ||
777 | list_for_each_entry(i, &comm_list->cg_children, ci_entry) { | 777 | list_for_each_entry(i, &comm_list->cg_children, ci_entry) { |
778 | cm = to_comm(i); | 778 | cm = to_comm(i); |
@@ -792,7 +792,7 @@ static struct comm *get_comm(int nodeid, struct sockaddr_storage *addr) | |||
792 | break; | 792 | break; |
793 | } | 793 | } |
794 | } | 794 | } |
795 | up(&clusters_root.subsys.su_sem); | 795 | mutex_unlock(&clusters_root.subsys.su_mutex); |
796 | 796 | ||
797 | if (!found) | 797 | if (!found) |
798 | cm = NULL; | 798 | cm = NULL; |