Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

3 files changed, 11 insertions, 25 deletions

diff --git a/fs/dlm/config.c b/fs/dlm/config.c
index 5069b2cb5a..2f8e3c81bc 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;
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 0553a6158d..dd362739d2 100644
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -1449,7 +1449,7 @@ int dlm_lowcomms_start(void)
         error = -ENOMEM;
         con_cache = kmem_cache_create("dlm_conn", sizeof(struct connection),
                                       __alignof__(struct connection), 0,
-                                      NULL, NULL);
+                                      NULL);
         if (!con_cache)
                 goto out;
 
diff --git a/fs/dlm/memory.c b/fs/dlm/memory.c
index f858fef6e4..ecf0e5cb20 100644
--- a/fs/dlm/memory.c
+++ b/fs/dlm/memory.c
@@ -23,7 +23,7 @@ int dlm_memory_init(void)
         int ret = 0;
 
         lkb_cache = kmem_cache_create("dlm_lkb", sizeof(struct dlm_lkb),
-                                __alignof__(struct dlm_lkb), 0, NULL, NULL);
+                                __alignof__(struct dlm_lkb), 0, NULL);
         if (!lkb_cache)
                 ret = -ENOMEM;
         return ret;
@@ -39,9 +39,7 @@ char *allocate_lvb(struct dlm_ls *ls)
 {
         char *p;
 
-        p = kmalloc(ls->ls_lvblen, GFP_KERNEL);
-        if (p)
-                memset(p, 0, ls->ls_lvblen);
+        p = kzalloc(ls->ls_lvblen, GFP_KERNEL);
         return p;
 }
 
@@ -59,9 +57,7 @@ struct dlm_rsb *allocate_rsb(struct dlm_ls *ls, int namelen)
 
         DLM_ASSERT(namelen <= DLM_RESNAME_MAXLEN,);
 
-        r = kmalloc(sizeof(*r) + namelen, GFP_KERNEL);
-        if (r)
-                memset(r, 0, sizeof(*r) + namelen);
+        r = kzalloc(sizeof(*r) + namelen, GFP_KERNEL);
         return r;
 }
 
@@ -101,9 +97,7 @@ struct dlm_direntry *allocate_direntry(struct dlm_ls *ls, int namelen)
         DLM_ASSERT(namelen <= DLM_RESNAME_MAXLEN,
                    printk("namelen = %d\n", namelen););
 
-        de = kmalloc(sizeof(*de) + namelen, GFP_KERNEL);
-        if (de)
-                memset(de, 0, sizeof(*de) + namelen);
+        de = kzalloc(sizeof(*de) + namelen, GFP_KERNEL);
         return de;
 }