mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
dd00cc486a
Transform some calls to kmalloc/memset to a single kzalloc (or kcalloc). Here is a short excerpt of the semantic patch performing this transformation: @@ type T2; expression x; identifier f,fld; expression E; expression E1,E2; expression e1,e2,e3,y; statement S; @@ x = - kmalloc + kzalloc (E1,E2) ... when != \(x->fld=E;\|y=f(...,x,...);\|f(...,x,...);\|x=E;\|while(...) S\|for(e1;e2;e3) S\) - memset((T2)x,0,E1); @@ expression E1,E2,E3; @@ - kzalloc(E1 * E2,E3) + kcalloc(E1,E2,E3) [akpm@linux-foundation.org: get kcalloc args the right way around] Signed-off-by: Yoann Padioleau <padator@wanadoo.fr> Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Acked-by: Russell King <rmk@arm.linux.org.uk> Cc: Bryan Wu <bryan.wu@analog.com> Acked-by: Jiri Slaby <jirislaby@gmail.com> Cc: Dave Airlie <airlied@linux.ie> Acked-by: Roland Dreier <rolandd@cisco.com> Cc: Jiri Kosina <jkosina@suse.cz> Acked-by: Dmitry Torokhov <dtor@mail.ru> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org> Acked-by: Pierre Ossman <drzeus-list@drzeus.cx> Cc: Jeff Garzik <jeff@garzik.org> Cc: "David S. Miller" <davem@davemloft.net> Acked-by: Greg KH <greg@kroah.com> Cc: James Bottomley <James.Bottomley@steeleye.com> Cc: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
108 lines
2.3 KiB
C
108 lines
2.3 KiB
C
/******************************************************************************
|
|
*******************************************************************************
|
|
**
|
|
** Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
|
|
** Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved.
|
|
**
|
|
** This copyrighted material is made available to anyone wishing to use,
|
|
** modify, copy, or redistribute it subject to the terms and conditions
|
|
** of the GNU General Public License v.2.
|
|
**
|
|
*******************************************************************************
|
|
******************************************************************************/
|
|
|
|
#include "dlm_internal.h"
|
|
#include "config.h"
|
|
#include "memory.h"
|
|
|
|
static struct kmem_cache *lkb_cache;
|
|
|
|
|
|
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);
|
|
if (!lkb_cache)
|
|
ret = -ENOMEM;
|
|
return ret;
|
|
}
|
|
|
|
void dlm_memory_exit(void)
|
|
{
|
|
if (lkb_cache)
|
|
kmem_cache_destroy(lkb_cache);
|
|
}
|
|
|
|
char *allocate_lvb(struct dlm_ls *ls)
|
|
{
|
|
char *p;
|
|
|
|
p = kzalloc(ls->ls_lvblen, GFP_KERNEL);
|
|
return p;
|
|
}
|
|
|
|
void free_lvb(char *p)
|
|
{
|
|
kfree(p);
|
|
}
|
|
|
|
/* FIXME: have some minimal space built-in to rsb for the name and
|
|
kmalloc a separate name if needed, like dentries are done */
|
|
|
|
struct dlm_rsb *allocate_rsb(struct dlm_ls *ls, int namelen)
|
|
{
|
|
struct dlm_rsb *r;
|
|
|
|
DLM_ASSERT(namelen <= DLM_RESNAME_MAXLEN,);
|
|
|
|
r = kzalloc(sizeof(*r) + namelen, GFP_KERNEL);
|
|
return r;
|
|
}
|
|
|
|
void free_rsb(struct dlm_rsb *r)
|
|
{
|
|
if (r->res_lvbptr)
|
|
free_lvb(r->res_lvbptr);
|
|
kfree(r);
|
|
}
|
|
|
|
struct dlm_lkb *allocate_lkb(struct dlm_ls *ls)
|
|
{
|
|
struct dlm_lkb *lkb;
|
|
|
|
lkb = kmem_cache_zalloc(lkb_cache, GFP_KERNEL);
|
|
return lkb;
|
|
}
|
|
|
|
void free_lkb(struct dlm_lkb *lkb)
|
|
{
|
|
if (lkb->lkb_flags & DLM_IFL_USER) {
|
|
struct dlm_user_args *ua;
|
|
ua = (struct dlm_user_args *)lkb->lkb_astparam;
|
|
if (ua) {
|
|
if (ua->lksb.sb_lvbptr)
|
|
kfree(ua->lksb.sb_lvbptr);
|
|
kfree(ua);
|
|
}
|
|
}
|
|
kmem_cache_free(lkb_cache, lkb);
|
|
}
|
|
|
|
struct dlm_direntry *allocate_direntry(struct dlm_ls *ls, int namelen)
|
|
{
|
|
struct dlm_direntry *de;
|
|
|
|
DLM_ASSERT(namelen <= DLM_RESNAME_MAXLEN,
|
|
printk("namelen = %d\n", namelen););
|
|
|
|
de = kzalloc(sizeof(*de) + namelen, GFP_KERNEL);
|
|
return de;
|
|
}
|
|
|
|
void free_direntry(struct dlm_direntry *de)
|
|
{
|
|
kfree(de);
|
|
}
|
|
|