Use mempool_alloc/free_slab
Subsystems (2)
PATCH 1/1 Use mempool_alloc/free_slab
Convert fs/bio.c and fs/jfs/jfs_metapage.c to use the mempool_alloc_slab and mempool_free_slab helper functions.
--
Brian Gerst
fs/bio.c +3 -13
@@ -52,16 +52,6 @@ };#undef BV -static void *slab_pool_alloc (int gfp_mask,void *data) -{ -return kmem_cache_alloc (data, gfp_mask); -} - -static void slab_pool_free (void *ptr,void *data) -{ -kmem_cache_free (data, ptr); -} -static inline struct bio_vec *bvec_alloc (int gfp_mask,int nr,unsigned long *idx) {struct biovec_pool *bp;
@@ -749,8 +739,8 @@if (i >= scale) pool_entries >>=1 ; - bp->pool =mempool_create (pool_entries, slab_pool_alloc, - slab_pool_free, bp->slab); + bp->pool =mempool_create (pool_entries, mempool_alloc_slab, + mempool_free_slab, bp->slab);if (!bp->pool)panic ("biovec: can't init mempool\n" );
@@ -766,7 +756,7 @@ SLAB_HWCACHE_ALIGN, NULL, NULL);if (!bio_slab)panic ("bio: can't create slab cache\n" ); - bio_pool =mempool_create (BIO_POOL_SIZE , slab_pool_alloc, slab_pool_free, bio_slab); + bio_pool =mempool_create (BIO_POOL_SIZE , mempool_alloc_slab, mempool_free_slab, bio_slab);if (!bio_pool)panic ("bio: can't create mempool\n" );
fs/jfs/jfs_metapage.c +2 -11
@@ -120,15 +120,6 @@mempool_free (mp, metapage_mempool); } -static void *mp_mempool_alloc (int gfp_mask,void *pool_data) -{ -return kmem_cache_alloc (metapage_cache, gfp_mask); -} -static void mp_mempool_free (void *element,void *pool_data) -{ -return kmem_cache_free (metapage_cache, element); -} -int __init metapage_init (void ) {/*
@@ -139,8 +130,8 @@if (metapage_cache ==NULL )return -ENOMEM ; - metapage_mempool =mempool_create (METAPOOL_MIN_PAGES , mp_mempool_alloc, - mp_mempool_free,NULL ); + metapage_mempool =mempool_create (METAPOOL_MIN_PAGES , mempool_alloc_slab, + mempool_free_slab, metapage_cache);if (metapage_mempool ==NULL ) {kmem_cache_destroy (metapage_cache);