Skip to content

Commit

Permalink
[PATCH] mempool: use common mempool kzalloc allocator
Browse files Browse the repository at this point in the history
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 <colpatch@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Matthew Dobson authored and Linus Torvalds committed Mar 26, 2006
1 parent f183323 commit 26b6e05
Showing 1 changed file with 2 additions and 15 deletions.
17 changes: 2 additions & 15 deletions drivers/md/multipath.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit 26b6e05

Please sign in to comment.