Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965008AbWA3VYj (ORCPT ); Mon, 30 Jan 2006 16:24:39 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1030180AbWA3VYN (ORCPT ); Mon, 30 Jan 2006 16:24:13 -0500 Received: from e36.co.us.ibm.com ([32.97.110.154]:57036 "EHLO e36.co.us.ibm.com") by vger.kernel.org with ESMTP id S965008AbWA3VYE (ORCPT ); Mon, 30 Jan 2006 16:24:04 -0500 Subject: [patch 6/8] mempool - Use common mempool kzalloc allocator From: Matthew Dobson Reply-To: colpatch@us.ibm.com To: linux-kernel@vger.kernel.org Cc: penberg@cs.helsinki.fi, akpm@osdl.org References: <20060130211951.225129000@localhost.localdomain> Content-Type: text/plain Organization: IBM LTC Date: Mon, 30 Jan 2006 13:24:02 -0800 Message-Id: <1138656242.20704.6.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.4.1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1712 Lines: 53 plain text document attachment (mempool-use_kzalloc_allocator.patch) This patch changes a mempool user, which is basically just a wrapper around kzalloc(), to use the common mempool_kmalloc/kfree, rather than its own wrapper function, removing duplicated code. Signed-off-by: Matthew Dobson drivers/md/multipath.c | 17 ++--------------- 1 files changed, 2 insertions(+), 15 deletions(-) Index: linux-2.6.16-rc1-mm4+mempool_work/drivers/md/multipath.c =================================================================== --- linux-2.6.16-rc1-mm4+mempool_work.orig/drivers/md/multipath.c +++ linux-2.6.16-rc1-mm4+mempool_work/drivers/md/multipath.c @@ -35,18 +35,6 @@ #define NR_RESERVED_BUFS 32 -static void *mp_pool_alloc(gfp_t gfp_flags, void *data) -{ - struct multipath_bh *mpb; - mpb = kzalloc(sizeof(*mpb), gfp_flags); - return mpb; -} - -static void mp_pool_free(void *mpb, void *data) -{ - kfree(mpb); -} - static int multipath_map (multipath_conf_t *conf) { int i, disks = conf->raid_disks; @@ -494,9 +482,8 @@ static int multipath_run (mddev_t *mddev } mddev->degraded = conf->raid_disks = conf->working_disks; - conf->pool = mempool_create(NR_RESERVED_BUFS, - mp_pool_alloc, mp_pool_free, - NULL); + conf->pool = mempool_create_kzalloc_pool(NR_RESERVED_BUFS, + sizeof(struct multipath_bh)); if (conf->pool == NULL) { printk(KERN_ERR "multipath: couldn't allocate memory for %s\n", -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/