There is always exactly one ubi_attach_info object allocated, therefore we don't have to care about the name.
Signed-off-by: Richard Weinberger <[email protected]> --- drivers/mtd/ubi/attach.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c index d1072bc..9364348 100644 --- a/drivers/mtd/ubi/attach.c +++ b/drivers/mtd/ubi/attach.c @@ -1297,7 +1297,7 @@ out_ech: return err; } -static struct ubi_attach_info *alloc_ai(const char *slab_name) +static struct ubi_attach_info *alloc_ai(void) { struct ubi_attach_info *ai; @@ -1310,7 +1310,7 @@ static struct ubi_attach_info *alloc_ai(const char *slab_name) INIT_LIST_HEAD(&ai->erase); INIT_LIST_HEAD(&ai->alien); ai->volumes = RB_ROOT; - ai->aeb_slab_cache = kmem_cache_create(slab_name, + ai->aeb_slab_cache = kmem_cache_create("ubi_aeb_slab_cache", sizeof(struct ubi_ainf_peb), 0, 0, NULL); if (!ai->aeb_slab_cache) { @@ -1371,7 +1371,7 @@ static int scan_fast(struct ubi_device *ubi, struct ubi_attach_info **ai) return UBI_NO_FASTMAP; destroy_ai(*ai); - *ai = alloc_ai("ubi_aeb_slab_cache"); + *ai = alloc_ai(); if (!*ai) return -ENOMEM; @@ -1400,7 +1400,7 @@ int ubi_attach(struct ubi_device *ubi, int force_scan) int err; struct ubi_attach_info *ai; - ai = alloc_ai("ubi_aeb_slab_cache"); + ai = alloc_ai(); if (!ai) return -ENOMEM; @@ -1418,7 +1418,7 @@ int ubi_attach(struct ubi_device *ubi, int force_scan) if (err > 0) { if (err != UBI_NO_FASTMAP) { destroy_ai(ai); - ai = alloc_ai("ubi_aeb_slab_cache2"); + ai = alloc_ai(); if (!ai) return -ENOMEM; @@ -1457,7 +1457,7 @@ int ubi_attach(struct ubi_device *ubi, int force_scan) if (ubi->fm && ubi_dbg_chk_gen(ubi)) { struct ubi_attach_info *scan_ai; - scan_ai = alloc_ai("ubi_ckh_aeb_slab_cache"); + scan_ai = alloc_ai(); if (!scan_ai) { err = -ENOMEM; goto out_wl; -- 1.8.4.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
