OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: zsmalloc: remove unused pool name 

zs_create_pool() currently takes a name argument which is
never used in any useful way.

This patch removes it.

Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com>
Acked-by: Nitin Gupta <ngupta@vflare.org>
Acked-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Seth Jennings 2013-01-30 09:36:52 -06:00 committed by Greg Kroah-Hartman
parent 5ccac0fd59
commit 0d145a5017
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/zram/zram_drv.c
View File

@ -575,7 +575,7 @@ int zram_init_device(struct zram *zram)
/* zram devices sort of resembles non-rotational disks */
queue_flag_set_unlocked(QUEUE_FLAG_NONROT, zram->disk->queue);
zram->mem_pool = zs_create_pool("zram", GFP_NOIO | __GFP_HIGHMEM);
zram->mem_pool = zs_create_pool(GFP_NOIO | __GFP_HIGHMEM);
if (!zram->mem_pool) {
pr_err("Error creating memory pool\n");
ret = -ENOMEM;

10
drivers/staging/zsmalloc/zsmalloc-main.c
View File

@ -207,7 +207,6 @@ struct zs_pool {
struct size_class size_class[ZS_SIZE_CLASSES];
gfp_t flags; /* allocation flags used when growing pool */
const char *name;
};
/*
@ -798,8 +797,7 @@ fail:
/**
* zs_create_pool - Creates an allocation pool to work from.
* @name: name of the pool to be created
* @flags: allocation flags used when growing pool
* @flags: allocation flags used to allocate pool metadata
*
* This function must be called before anything when using
* the zsmalloc allocator.
@ -807,14 +805,11 @@ fail:
* On success, a pointer to the newly created pool is returned,
* otherwise NULL.
*/
struct zs_pool *zs_create_pool(const char *name, gfp_t flags)
struct zs_pool *zs_create_pool(gfp_t flags)
{
int i, ovhd_size;
struct zs_pool *pool;
if (!name)
return NULL;
ovhd_size = roundup(sizeof(*pool), PAGE_SIZE);
pool = kzalloc(ovhd_size, GFP_KERNEL);
if (!pool)
@ -837,7 +832,6 @@ struct zs_pool *zs_create_pool(const char *name, gfp_t flags)
}
pool->flags = flags;
pool->name = name;
return pool;
}

2
drivers/staging/zsmalloc/zsmalloc.h
View File

@ -28,7 +28,7 @@ enum zs_mapmode {
struct zs_pool;
struct zs_pool *zs_create_pool(const char *name, gfp_t flags);
struct zs_pool *zs_create_pool(gfp_t flags);
void zs_destroy_pool(struct zs_pool *pool);
unsigned long zs_malloc(struct zs_pool *pool, size_t size);