Commit 0d145a50 authored by Seth Jennings's avatar Seth Jennings Committed by Greg Kroah-Hartman

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: default avatarSeth Jennings <sjenning@linux.vnet.ibm.com>
Acked-by: default avatarNitin Gupta <ngupta@vflare.org>
Acked-by: default avatarRik van Riel <riel@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5ccac0fd
...@@ -575,7 +575,7 @@ int zram_init_device(struct zram *zram) ...@@ -575,7 +575,7 @@ int zram_init_device(struct zram *zram)
/* zram devices sort of resembles non-rotational disks */ /* zram devices sort of resembles non-rotational disks */
queue_flag_set_unlocked(QUEUE_FLAG_NONROT, zram->disk->queue); 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) { if (!zram->mem_pool) {
pr_err("Error creating memory pool\n"); pr_err("Error creating memory pool\n");
ret = -ENOMEM; ret = -ENOMEM;
......
...@@ -207,7 +207,6 @@ struct zs_pool { ...@@ -207,7 +207,6 @@ struct zs_pool {
struct size_class size_class[ZS_SIZE_CLASSES]; struct size_class size_class[ZS_SIZE_CLASSES];
gfp_t flags; /* allocation flags used when growing pool */ gfp_t flags; /* allocation flags used when growing pool */
const char *name;
}; };
/* /*
...@@ -798,8 +797,7 @@ static int zs_init(void) ...@@ -798,8 +797,7 @@ static int zs_init(void)
/** /**
* zs_create_pool - Creates an allocation pool to work from. * zs_create_pool - Creates an allocation pool to work from.
* @name: name of the pool to be created * @flags: allocation flags used to allocate pool metadata
* @flags: allocation flags used when growing pool
* *
* This function must be called before anything when using * This function must be called before anything when using
* the zsmalloc allocator. * the zsmalloc allocator.
...@@ -807,14 +805,11 @@ static int zs_init(void) ...@@ -807,14 +805,11 @@ static int zs_init(void)
* On success, a pointer to the newly created pool is returned, * On success, a pointer to the newly created pool is returned,
* otherwise NULL. * 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; int i, ovhd_size;
struct zs_pool *pool; struct zs_pool *pool;
if (!name)
return NULL;
ovhd_size = roundup(sizeof(*pool), PAGE_SIZE); ovhd_size = roundup(sizeof(*pool), PAGE_SIZE);
pool = kzalloc(ovhd_size, GFP_KERNEL); pool = kzalloc(ovhd_size, GFP_KERNEL);
if (!pool) if (!pool)
...@@ -837,7 +832,6 @@ struct zs_pool *zs_create_pool(const char *name, gfp_t flags) ...@@ -837,7 +832,6 @@ struct zs_pool *zs_create_pool(const char *name, gfp_t flags)
} }
pool->flags = flags; pool->flags = flags;
pool->name = name;
return pool; return pool;
} }
......
...@@ -28,7 +28,7 @@ enum zs_mapmode { ...@@ -28,7 +28,7 @@ enum zs_mapmode {
struct zs_pool; 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); void zs_destroy_pool(struct zs_pool *pool);
unsigned long zs_malloc(struct zs_pool *pool, size_t size); unsigned long zs_malloc(struct zs_pool *pool, size_t size);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment