Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/staging/zram/zram_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/staging/zsmalloc/zsmalloc-main.c

+2 −8
Original line number Diff line number Diff line
@@ -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;

}

drivers/staging/zsmalloc/zsmalloc.h

+1 −1
Original line number Diff line number Diff line
@@ -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);