[PATCH v2 0/2] mm:constify zpool/zs_pool char members

[PATCH v2 0/2] mm:constify zpool/zs_pool char members

[Sergey Senozhatsky]

Hi,
Two trivial patches to constify zs_pool and zpool ->name and ->type
members and functions' signatures that set/return them.


Sergey Senozhatsky (2):
  mm:zpool: constify struct zpool type
  mm:zsmalloc: constify struct zs_pool name

 include/linux/zpool.h    | 10 ++++++----
 include/linux/zsmalloc.h |  2 +-
 mm/zbud.c                |  2 +-
 mm/zpool.c               | 10 +++++-----
 mm/zsmalloc.c            | 10 +++++-----
 5 files changed, 18 insertions(+), 16 deletions(-)

-- 
2.5.1

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

[PATCH v2 1/2] mm:zpool: constify struct zpool type

[Sergey Senozhatsky]

Constify `struct zpool' ->type.

Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
---
 include/linux/zpool.h | 6 +++---
 mm/zpool.c            | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/linux/zpool.h b/include/linux/zpool.h
index c924a28..0ef5581 100644
--- a/include/linux/zpool.h
+++ b/include/linux/zpool.h
@@ -36,10 +36,10 @@ enum zpool_mapmode {
 	ZPOOL_MM_DEFAULT = ZPOOL_MM_RW
 };
 
-struct zpool *zpool_create_pool(char *type, char *name,
+struct zpool *zpool_create_pool(const char *type, char *name,
 			gfp_t gfp, const struct zpool_ops *ops);
 
-char *zpool_get_type(struct zpool *pool);
+const char *zpool_get_type(struct zpool *pool);
 
 void zpool_destroy_pool(struct zpool *pool);
 
@@ -76,7 +76,7 @@ u64 zpool_get_total_size(struct zpool *pool);
  * with zpool.
  */
 struct zpool_driver {
-	char *type;
+	const char *type;
 	struct module *owner;
 	atomic_t refcount;
 	struct list_head list;
diff --git a/mm/zpool.c b/mm/zpool.c
index 68d2dd8..e83fce7 100644
--- a/mm/zpool.c
+++ b/mm/zpool.c
@@ -18,7 +18,7 @@
 #include <linux/zpool.h>
 
 struct zpool {
-	char *type;
+	const char *type;
 
 	struct zpool_driver *driver;
 	void *pool;
@@ -73,7 +73,7 @@ int zpool_unregister_driver(struct zpool_driver *driver)
 }
 EXPORT_SYMBOL(zpool_unregister_driver);
 
-static struct zpool_driver *zpool_get_driver(char *type)
+static struct zpool_driver *zpool_get_driver(const char *type)
 {
 	struct zpool_driver *driver;
 
@@ -114,7 +114,7 @@ static void zpool_put_driver(struct zpool_driver *driver)
  *
  * 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, char *name, gfp_t gfp,
 		const struct zpool_ops *ops)
 {
 	struct zpool_driver *driver;
@@ -195,7 +195,7 @@ void zpool_destroy_pool(struct zpool *zpool)
  *
  * Returns: The type of zpool.
  */
-char *zpool_get_type(struct zpool *zpool)
+const char *zpool_get_type(struct zpool *zpool)
 {
 	return zpool->type;
 }
-- 
2.5.1

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

[PATCH v2 2/2] mm:zsmalloc: constify struct zs_pool name

[Sergey Senozhatsky]

Constify `struct zs_pool' ->name.

Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
---
 include/linux/zpool.h    |  6 ++++--
 include/linux/zsmalloc.h |  2 +-
 mm/zbud.c                |  2 +-
 mm/zpool.c               |  4 ++--
 mm/zsmalloc.c            | 10 +++++-----
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/include/linux/zpool.h b/include/linux/zpool.h
index 0ef5581..e2c7e92 100644
--- a/include/linux/zpool.h
+++ b/include/linux/zpool.h
@@ -36,7 +36,7 @@ enum zpool_mapmode {
 	ZPOOL_MM_DEFAULT = ZPOOL_MM_RW
 };
 
-struct zpool *zpool_create_pool(const 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);
@@ -81,7 +81,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);
 
diff --git a/include/linux/zsmalloc.h b/include/linux/zsmalloc.h
index 6398dfa..34eb160 100644
--- a/include/linux/zsmalloc.h
+++ b/include/linux/zsmalloc.h
@@ -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);
diff --git a/mm/zbud.c b/mm/zbud.c
index fa48bcdf..d8a181f 100644
--- a/mm/zbud.c
+++ b/mm/zbud.c
@@ -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)
 {
diff --git a/mm/zpool.c b/mm/zpool.c
index e83fce7..089ea3a 100644
--- a/mm/zpool.c
+++ b/mm/zpool.c
@@ -114,8 +114,8 @@ static void zpool_put_driver(struct zpool_driver *driver)
  *
  * Returns: New zpool on success, NULL on failure.
  */
-struct zpool *zpool_create_pool(const char *type, char *name, gfp_t gfp,
-		const struct zpool_ops *ops)
+struct zpool *zpool_create_pool(const char *type, const char *name,
+		gfp_t gfp, const struct zpool_ops *ops)
 {
 	struct zpool_driver *driver;
 	struct zpool *zpool;
diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index f135b1b..8b8e0da 100644
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -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;
-- 
2.5.1

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

Re: [PATCH v2 2/2] mm:zsmalloc: constify struct zs_pool name

[Dan Streetman]

On Fri, Sep 11, 2015 at 8:18 AM, Sergey Senozhatsky
<sergey.senozhatsky@gmail.com> wrote:
> Constify `struct zs_pool' ->name.
>
> Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>

Acked-by: Dan Streetman <ddstreet@ieee.org>

> ---
>  include/linux/zpool.h    |  6 ++++--
>  include/linux/zsmalloc.h |  2 +-
>  mm/zbud.c                |  2 +-
>  mm/zpool.c               |  4 ++--
>  mm/zsmalloc.c            | 10 +++++-----
>  5 files changed, 13 insertions(+), 11 deletions(-)
>
> diff --git a/include/linux/zpool.h b/include/linux/zpool.h
> index 0ef5581..e2c7e92 100644
> --- a/include/linux/zpool.h
> +++ b/include/linux/zpool.h
> @@ -36,7 +36,7 @@ enum zpool_mapmode {
>         ZPOOL_MM_DEFAULT = ZPOOL_MM_RW
>  };
>
> -struct zpool *zpool_create_pool(const 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);
> @@ -81,7 +81,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);
>
> diff --git a/include/linux/zsmalloc.h b/include/linux/zsmalloc.h
> index 6398dfa..34eb160 100644
> --- a/include/linux/zsmalloc.h
> +++ b/include/linux/zsmalloc.h
> @@ -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);
> diff --git a/mm/zbud.c b/mm/zbud.c
> index fa48bcdf..d8a181f 100644
> --- a/mm/zbud.c
> +++ b/mm/zbud.c
> @@ -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)
>  {
> diff --git a/mm/zpool.c b/mm/zpool.c
> index e83fce7..089ea3a 100644
> --- a/mm/zpool.c
> +++ b/mm/zpool.c
> @@ -114,8 +114,8 @@ static void zpool_put_driver(struct zpool_driver *driver)
>   *
>   * Returns: New zpool on success, NULL on failure.
>   */
> -struct zpool *zpool_create_pool(const char *type, char *name, gfp_t gfp,
> -               const struct zpool_ops *ops)
> +struct zpool *zpool_create_pool(const char *type, const char *name,
> +               gfp_t gfp, const struct zpool_ops *ops)
>  {
>         struct zpool_driver *driver;
>         struct zpool *zpool;
> diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
> index f135b1b..8b8e0da 100644
> --- a/mm/zsmalloc.c
> +++ b/mm/zsmalloc.c
> @@ -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;
> --
> 2.5.1
>

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>