1 files changed, 6 insertions, 14 deletions

diff --git a/fs/dlm/config.c b/fs/dlm/config.c
index 5069b2cb5a1f..2f8e3c81bc19 100644
--- a/fs/dlm/config.c
+++ b/fs/dlm/config.c
@@ -133,14 +133,6 @@ static ssize_t cluster_set(struct cluster *cl, unsigned int *cl_field,
         return len;
 }
 
-#define __CONFIGFS_ATTR(_name,_mode,_read,_write) {                           \
-        .attr   = { .ca_name = __stringify(_name),                            \
-                    .ca_mode = _mode,                                         \
-                    .ca_owner = THIS_MODULE },                                \
-        .show   = _read,                                                      \
-        .store  = _write,                                                     \
-}
-
 #define CLUSTER_ATTR(name, check_zero)                                        \
 static ssize_t name##_write(struct cluster *cl, const char *buf, size_t len)  \
 {                                                                             \
@@ -615,7 +607,7 @@ static struct clusters clusters_root = {
 int dlm_config_init(void)
 {
         config_group_init(&clusters_root.subsys.su_group);
-        init_MUTEX(&clusters_root.subsys.su_sem);
+        mutex_init(&clusters_root.subsys.su_mutex);
         return configfs_register_subsystem(&clusters_root.subsys);
 }
 
@@ -759,9 +751,9 @@ static struct space *get_space(char *name)
         if (!space_list)
                 return NULL;
 
-        down(&space_list->cg_subsys->su_sem);
-        i = config_group_find_obj(space_list, name);
-        up(&space_list->cg_subsys->su_sem);
+        mutex_lock(&space_list->cg_subsys->su_mutex);
+        i = config_group_find_item(space_list, name);
+        mutex_unlock(&space_list->cg_subsys->su_mutex);
 
         return to_space(i);
 }
@@ -780,7 +772,7 @@ static struct comm *get_comm(int nodeid, struct sockaddr_storage *addr)
         if (!comm_list)
                 return NULL;
 
-        down(&clusters_root.subsys.su_sem);
+        mutex_lock(&clusters_root.subsys.su_mutex);
 
         list_for_each_entry(i, &comm_list->cg_children, ci_entry) {
                 cm = to_comm(i);
@@ -800,7 +792,7 @@ static struct comm *get_comm(int nodeid, struct sockaddr_storage *addr)
                         break;
                 }
         }
-        up(&clusters_root.subsys.su_sem);
+        mutex_unlock(&clusters_root.subsys.su_mutex);
 
         if (!found)
                 cm = NULL;