From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754134Ab3AGUZG (ORCPT ); Mon, 7 Jan 2013 15:25:06 -0500 Received: from e36.co.us.ibm.com ([32.97.110.154]:47010 "EHLO e36.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753412Ab3AGUZB (ORCPT ); Mon, 7 Jan 2013 15:25:01 -0500 From: Seth Jennings To: Greg Kroah-Hartman , Andrew Morton Cc: Seth Jennings , Nitin Gupta , Minchan Kim , Konrad Rzeszutek Wilk , Dan Magenheimer , Robert Jennings , Jenifer Hopper , Mel Gorman , Johannes Weiner , Rik van Riel , Larry Woodman , linux-mm@kvack.org, linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org Subject: [PATCHv2 2/9] staging: zsmalloc: remove unsed pool name Date: Mon, 7 Jan 2013 14:24:33 -0600 Message-Id: <1357590280-31535-3-git-send-email-sjenning@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1357590280-31535-1-git-send-email-sjenning@linux.vnet.ibm.com> References: <1357590280-31535-1-git-send-email-sjenning@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13010720-7606-0000-0000-00000738CDD0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org zs_create_pool() currently takes a name argument which is never used in any useful way. This patch removes it. Signed-off-by: Seth Jennnings --- drivers/staging/zcache/zcache-main.c | 2 +- drivers/staging/zram/zram_drv.c | 2 +- drivers/staging/zsmalloc/zsmalloc-main.c | 7 +------ drivers/staging/zsmalloc/zsmalloc.h | 2 +- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/staging/zcache/zcache-main.c b/drivers/staging/zcache/zcache-main.c index 674c754..6fa9f9a 100644 --- a/drivers/staging/zcache/zcache-main.c +++ b/drivers/staging/zcache/zcache-main.c @@ -982,7 +982,7 @@ int zcache_new_client(uint16_t cli_id) goto out; cli->allocated = 1; #ifdef CONFIG_FRONTSWAP - cli->zspool = zs_create_pool("zcache", GFP_KERNEL); + cli->zspool = zs_create_pool(GFP_KERNEL); if (cli->zspool == NULL) goto out; idr_init(&cli->tmem_pools); diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c index 13e9b4b..13d9f6d 100644 --- a/drivers/staging/zram/zram_drv.c +++ b/drivers/staging/zram/zram_drv.c @@ -576,7 +576,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 6ff380e..5e212c0 100644 --- a/drivers/staging/zsmalloc/zsmalloc-main.c +++ b/drivers/staging/zsmalloc/zsmalloc-main.c @@ -796,14 +796,11 @@ fail: return notifier_to_errno(ret); } -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) @@ -825,8 +822,6 @@ struct zs_pool *zs_create_pool(const char *name, gfp_t flags) } - pool->name = name; - return pool; } EXPORT_SYMBOL_GPL(zs_create_pool); 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