linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Seth Jennings <sjenning@linux.vnet.ibm.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Seth Jennings <sjenning@linux.vnet.ibm.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Dan Magenheimer <dan.magenheimer@oracle.com>,
	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
	Nitin Gupta <ngupta@vflare.org>, Minchan Kim <minchan@kernel.org>,
	Robert Jennings <rcj@linux.vnet.ibm.com>,
	linux-mm@kvack.org, devel@driverdev.osuosl.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH 2/4] staging: zsmalloc: remove unused pool name
Date: Fri, 25 Jan 2013 11:46:16 -0600	[thread overview]
Message-ID: <1359135978-15119-3-git-send-email-sjenning@linux.vnet.ibm.com> (raw)
In-Reply-To: <1359135978-15119-1-git-send-email-sjenning@linux.vnet.ibm.com>

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

This patch removes it.

Acked-by: Nitin Gupta <ngupta@vflare.org>
Signed-off-by: Seth Jennnings <sjenning@linux.vnet.ibm.com>
---
 drivers/staging/zram/zram_drv.c          |    2 +-
 drivers/staging/zsmalloc/zsmalloc-main.c |   11 +++--------
 drivers/staging/zsmalloc/zsmalloc.h      |    2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c
index 836dccf..2086682 100644
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@ -565,7 +565,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_KERNEL);
+	zram->mem_pool = zs_create_pool(GFP_KERNEL);
 	if (!zram->mem_pool) {
 		pr_err("Error creating memory pool\n");
 		ret = -ENOMEM;
diff --git a/drivers/staging/zsmalloc/zsmalloc-main.c b/drivers/staging/zsmalloc/zsmalloc-main.c
index f29f170..711a854 100644
--- a/drivers/staging/zsmalloc/zsmalloc-main.c
+++ b/drivers/staging/zsmalloc/zsmalloc-main.c
@@ -798,8 +798,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 +806,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, flags);
 	if (!pool)
@@ -836,8 +832,6 @@ struct zs_pool *zs_create_pool(const char *name, gfp_t flags)
 
 	}
 
-	pool->name = name;
-
 	return pool;
 }
 EXPORT_SYMBOL_GPL(zs_create_pool);
@@ -866,6 +860,7 @@ EXPORT_SYMBOL_GPL(zs_destroy_pool);
  * zs_malloc - Allocate block of given size from pool.
  * @pool: pool to allocate from
  * @size: size of block to allocate
+ * @flags: gfp flags used when expanding the pool
  *
  * On success, handle to the allocated object is returned,
  * otherwise 0.
diff --git a/drivers/staging/zsmalloc/zsmalloc.h b/drivers/staging/zsmalloc/zsmalloc.h
index 907ff03..25a4b4d 100644
--- a/drivers/staging/zsmalloc/zsmalloc.h
+++ b/drivers/staging/zsmalloc/zsmalloc.h
@@ -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, gfp_t flags);
-- 
1.7.9.5


  parent reply	other threads:[~2013-01-25 17:46 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-25 17:46 [PATCH 0/4] staging: zsmalloc: various cleanups/improvments Seth Jennings
2013-01-25 17:46 ` [PATCH 1/4] staging: zsmalloc: add gfp flags to zs_create_pool Seth Jennings
2013-01-28  3:39   ` Minchan Kim
2013-01-28 15:16     ` Konrad Rzeszutek Wilk
2013-01-28 23:33       ` Minchan Kim
2013-01-28 17:01     ` Seth Jennings
2013-01-28 23:38       ` Minchan Kim
2013-01-25 17:46 ` Seth Jennings [this message]
2013-01-28  3:40   ` [PATCH 2/4] staging: zsmalloc: remove unused pool name Minchan Kim
2013-01-30  4:16   ` Greg Kroah-Hartman
2013-01-30 15:36     ` [PATCH] " Seth Jennings
2013-01-30 15:41       ` Seth Jennings
2013-01-30 17:21         ` Greg Kroah-Hartman
2013-01-30 17:29           ` Konrad Rzeszutek Wilk
2013-01-31  5:32             ` Greg Kroah-Hartman
2013-02-01  2:11               ` Konrad Rzeszutek Wilk
2013-01-30 17:33           ` Seth Jennings
2013-01-25 17:46 ` [PATCH 3/4] staging: zsmalloc: add page alloc/free callbacks Seth Jennings
2013-01-28  3:42   ` Minchan Kim
2013-01-25 17:46 ` [PATCH 4/4] staging: zsmalloc: make CLASS_DELTA relative to PAGE_SIZE Seth Jennings
2013-01-28  3:44   ` Minchan Kim
2013-01-28  3:47 ` [PATCH 0/4] staging: zsmalloc: various cleanups/improvments Minchan Kim
2013-01-28 17:07   ` Seth Jennings
2013-01-28 23:44     ` Minchan Kim
2013-01-30  4:17   ` Greg Kroah-Hartman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1359135978-15119-3-git-send-email-sjenning@linux.vnet.ibm.com \
    --to=sjenning@linux.vnet.ibm.com \
    --cc=akpm@linux-foundation.org \
    --cc=dan.magenheimer@oracle.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=konrad.wilk@oracle.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=minchan@kernel.org \
    --cc=ngupta@vflare.org \
    --cc=rcj@linux.vnet.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).