Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-13 23:51:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

dlm: cleanup memory allocation helpers

Browse Source 
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>
This commit is contained in:
Alexander Aring 2024-08-02 13:26:38 -04:00 committed by David Teigland
parent de9c2c66ad
commit 1169788544
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/dlm/lock.c
View File

@ -600,7 +600,7 @@ static int get_rsb_struct(struct dlm_ls *ls, const void *name, int len,
{ {
struct dlm_rsb *r; struct dlm_rsb *r;
r = dlm_allocate_rsb(ls); r = dlm_allocate_rsb();
if (!r) if (!r)
return -ENOMEM; return -ENOMEM;
@ -1497,7 +1497,7 @@ static int _create_lkb(struct dlm_ls *ls, struct dlm_lkb **lkb_ret,
limit.max = end; limit.max = end;
limit.min = start; limit.min = start;
lkb = dlm_allocate_lkb(ls); lkb = dlm_allocate_lkb();
if (!lkb) if (!lkb)
return -ENOMEM; return -ENOMEM;

19
fs/dlm/memory.c
View File

@ -84,10 +84,7 @@ void dlm_memory_exit(void)
char *dlm_allocate_lvb(struct dlm_ls *ls) char *dlm_allocate_lvb(struct dlm_ls *ls)
{ {
char *p; return kzalloc(ls->ls_lvblen, GFP_ATOMIC);
p = kzalloc(ls->ls_lvblen, GFP_ATOMIC);
return p;
} }
void dlm_free_lvb(char *p) void dlm_free_lvb(char *p)
@ -95,12 +92,9 @@ void dlm_free_lvb(char *p)
kfree(p); kfree(p);
} }
struct dlm_rsb *dlm_allocate_rsb(struct dlm_ls *ls) struct dlm_rsb *dlm_allocate_rsb(void)
{ {
struct dlm_rsb *r; return kmem_cache_zalloc(rsb_cache, GFP_ATOMIC);
r = kmem_cache_zalloc(rsb_cache, GFP_ATOMIC);
return r;
} }
static void __free_rsb_rcu(struct rcu_head *rcu) 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); 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; return kmem_cache_zalloc(lkb_cache, GFP_ATOMIC);
lkb = kmem_cache_zalloc(lkb_cache, GFP_ATOMIC);
return lkb;
} }
void dlm_free_lkb(struct dlm_lkb *lkb) void dlm_free_lkb(struct dlm_lkb *lkb)

4
fs/dlm/memory.h
View File

@ -14,9 +14,9 @@
int dlm_memory_init(void); int dlm_memory_init(void);
void dlm_memory_exit(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); 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); void dlm_free_lkb(struct dlm_lkb *l);
char *dlm_allocate_lvb(struct dlm_ls *ls); char *dlm_allocate_lvb(struct dlm_ls *ls);
void dlm_free_lvb(char *l); void dlm_free_lvb(char *l);