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

Commit 6f3526d6 authored by Sergey SENOZHATSKY's avatar Sergey SENOZHATSKY Committed by Linus Torvalds
Browse files

mm: zsmalloc: constify struct zs_pool name 



Constify `struct zs_pool' ->name.

[akpm@inux-foundation.org: constify zpool_create_pool()'s `type' arg also]
Signed-off-by: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
Acked-by: default avatarDan Streetman <ddstreet@ieee.org>
Cc: Minchan Kim <minchan@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 69e18f4d

include/linux/zpool.h

+4 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ enum zpool_mapmode { 


bool zpool_has_pool(char *type);



struct zpool *zpool_create_pool(char *type, char *name,

struct zpool *zpool_create_pool(const char *type, const char *name,

			gfp_t gfp, const struct zpool_ops *ops);



const char *zpool_get_type(struct zpool *pool);
@@ -83,7 +83,9 @@ struct zpool_driver { 
	atomic_t refcount;

	struct list_head list;



	void *(*create)(char *name, gfp_t gfp, const struct zpool_ops *ops,

	void *(*create)(const char *name,

			gfp_t gfp,

			const struct zpool_ops *ops,

			struct zpool *zpool);

	void (*destroy)(void *pool);

include/linux/zsmalloc.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ struct zs_pool_stats { 


struct zs_pool;



struct zs_pool *zs_create_pool(char *name, gfp_t flags);

struct zs_pool *zs_create_pool(const char *name, gfp_t flags);

void zs_destroy_pool(struct zs_pool *pool);



unsigned long zs_malloc(struct zs_pool *pool, size_t size);

mm/zbud.c

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static const struct zbud_ops zbud_zpool_ops = { 
	.evict =	zbud_zpool_evict

};



static void *zbud_zpool_create(char *name, gfp_t gfp,

static void *zbud_zpool_create(const char *name, gfp_t gfp,

			       const struct zpool_ops *zpool_ops,

			       struct zpool *zpool)

{

mm/zpool.c

+2 −2
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ int zpool_unregister_driver(struct zpool_driver *driver) 
EXPORT_SYMBOL(zpool_unregister_driver);



/* this assumes @type is null-terminated. */

static struct zpool_driver *zpool_get_driver(char *type)

static struct zpool_driver *zpool_get_driver(const char *type)

{

	struct zpool_driver *driver;
@@ -150,7 +150,7 @@ EXPORT_SYMBOL(zpool_has_pool); 
 *

 * Returns: New zpool on success, NULL on failure.

 */

struct zpool *zpool_create_pool(char *type, char *name, gfp_t gfp,

struct zpool *zpool_create_pool(const char *type, const char *name, gfp_t gfp,

		const struct zpool_ops *ops)

{

	struct zpool_driver *driver;

mm/zsmalloc.c

+5 −5
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ struct link_free { 
};



struct zs_pool {

	char *name;

	const char *name;



	struct size_class **size_class;

	struct kmem_cache *handle_cachep;
@@ -311,7 +311,7 @@ static void record_obj(unsigned long handle, unsigned long obj) 


#ifdef CONFIG_ZPOOL



static void *zs_zpool_create(char *name, gfp_t gfp,

static void *zs_zpool_create(const char *name, gfp_t gfp,

			     const struct zpool_ops *zpool_ops,

			     struct zpool *zpool)

{
@@ -548,7 +548,7 @@ static const struct file_operations zs_stat_size_ops = { 
	.release        = single_release,

};



static int zs_pool_stat_create(char *name, struct zs_pool *pool)

static int zs_pool_stat_create(const char *name, struct zs_pool *pool)

{

	struct dentry *entry;
@@ -588,7 +588,7 @@ static void __exit zs_stat_exit(void) 
{

}



static inline int zs_pool_stat_create(char *name, struct zs_pool *pool)

static inline int zs_pool_stat_create(const char *name, struct zs_pool *pool)

{

	return 0;

}
@@ -1866,7 +1866,7 @@ static int zs_register_shrinker(struct zs_pool *pool) 
 * On success, a pointer to the newly created pool is returned,

 * otherwise NULL.

 */

struct zs_pool *zs_create_pool(char *name, gfp_t flags)

struct zs_pool *zs_create_pool(const char *name, gfp_t flags)

{

	int i;

	struct zs_pool *pool;