dlm: cleanup memory allocation helpers

This patch removes a unnecessary parameter from DLM memory allocation
helpers and reduce some functions by just directly reply the pointer
address of the allocated memory.

Signed-off-by: Alexander Aring <aahringo@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>

diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
index 8bee4f444afdc02485f9680585c0ebe6f0ec0cc1..6930d7c57216b5414b51b80f2528710c63ae1dad 100644 (file)
--- a/fs/dlm/lock.c
+++ b/fs/dlm/lock.c
@@ -600,7 +600,7 @@ static int get_rsb_struct(struct dlm_ls *ls, const void *name, int len,
 {
        struct dlm_rsb *r;
 
-       r = dlm_allocate_rsb(ls);
+       r = dlm_allocate_rsb();
        if (!r)
                return -ENOMEM;
 
@@ -1497,7 +1497,7 @@ static int _create_lkb(struct dlm_ls *ls, struct dlm_lkb **lkb_ret,
        limit.max = end;
        limit.min = start;
 
-       lkb = dlm_allocate_lkb(ls);
+       lkb = dlm_allocate_lkb();
        if (!lkb)
                return -ENOMEM;
 

diff --git a/fs/dlm/memory.c b/fs/dlm/memory.c
index 8c44b954c16605ae3560151e1b147a7ef42770dc..442898cf7185e030c0ad2434929e3ebd8d05fdfe 100644 (file)
--- a/fs/dlm/memory.c
+++ b/fs/dlm/memory.c
@@ -84,10 +84,7 @@ void dlm_memory_exit(void)
 
 char *dlm_allocate_lvb(struct dlm_ls *ls)
 {
-       char *p;
-
-       p = kzalloc(ls->ls_lvblen, GFP_ATOMIC);
-       return p;
+       return kzalloc(ls->ls_lvblen, GFP_ATOMIC);
 }
 
 void dlm_free_lvb(char *p)
@@ -95,12 +92,9 @@ void dlm_free_lvb(char *p)
        kfree(p);
 }
 
-struct dlm_rsb *dlm_allocate_rsb(struct dlm_ls *ls)
+struct dlm_rsb *dlm_allocate_rsb(void)
 {
-       struct dlm_rsb *r;
-
-       r = kmem_cache_zalloc(rsb_cache, GFP_ATOMIC);
-       return r;
+       return kmem_cache_zalloc(rsb_cache, GFP_ATOMIC);
 }
 
 static void __free_rsb_rcu(struct rcu_head *rcu)
@@ -116,12 +110,9 @@ void dlm_free_rsb(struct dlm_rsb *r)
        call_rcu(&r->rcu, __free_rsb_rcu);
 }
 
-struct dlm_lkb *dlm_allocate_lkb(struct dlm_ls *ls)
+struct dlm_lkb *dlm_allocate_lkb(void)
 {
-       struct dlm_lkb *lkb;
-
-       lkb = kmem_cache_zalloc(lkb_cache, GFP_ATOMIC);
-       return lkb;
+       return kmem_cache_zalloc(lkb_cache, GFP_ATOMIC);
 }
 
 void dlm_free_lkb(struct dlm_lkb *lkb)

diff --git a/fs/dlm/memory.h b/fs/dlm/memory.h
index 15198d46b42ab76183f2352d22c0028cf30aaca6..551b6b788489e35f6ab9987b0046a7d68aa28f99 100644 (file)
--- a/fs/dlm/memory.h
+++ b/fs/dlm/memory.h
@@ -14,9 +14,9 @@
 
 int dlm_memory_init(void);
 void dlm_memory_exit(void);
-struct dlm_rsb *dlm_allocate_rsb(struct dlm_ls *ls);
+struct dlm_rsb *dlm_allocate_rsb(void);
 void dlm_free_rsb(struct dlm_rsb *r);
-struct dlm_lkb *dlm_allocate_lkb(struct dlm_ls *ls);
+struct dlm_lkb *dlm_allocate_lkb(void);
 void dlm_free_lkb(struct dlm_lkb *l);
 char *dlm_allocate_lvb(struct dlm_ls *ls);
 void dlm_free_lvb(char *l);