[PATCH] mempool: use mempool_create_slab_pool()

Modify well over a dozen mempool users to call mempool_create_slab_pool()
rather than calling mempool_create() with extra arguments, saving about 30
lines of code and increasing readability.

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>

10 files changed, 15 insertions, 26 deletions

diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index 32fea55fac48..393b86a3dbf8 100644
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -211,9 +211,7 @@ aoeblk_gdalloc(void *vp)
                 return;
         }
 
-        d->bufpool = mempool_create(MIN_BUFS,
-                                    mempool_alloc_slab, mempool_free_slab,
-                                    buf_pool_cache);
+        d->bufpool = mempool_create_slab_pool(MIN_BUFS, buf_pool_cache);
         if (d->bufpool == NULL) {
                 printk(KERN_ERR "aoe: aoeblk_gdalloc: cannot allocate bufpool "
                         "for %ld.%ld\n", d->aoemajor, d->aoeminor);
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index d88b8eda3903..259e86f26549 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -616,8 +616,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 }
         }
 
-        cc->io_pool = mempool_create(MIN_IOS, mempool_alloc_slab,
-                                     mempool_free_slab, _crypt_io_pool);
+        cc->io_pool = mempool_create_slab_pool(MIN_IOS, _crypt_io_pool);
         if (!cc->io_pool) {
                 ti->error = PFX "Cannot allocate crypt io mempool";
                 goto bad3;
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index f72a82fb9434..1816f30678ed 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -179,8 +179,7 @@ static struct multipath *alloc_multipath(void)
                 m->queue_io = 1;
                 INIT_WORK(&m->process_queued_ios, process_queued_ios, m);
                 INIT_WORK(&m->trigger_event, trigger_event, m);
-                m->mpio_pool = mempool_create(MIN_IOS, mempool_alloc_slab,
-                                              mempool_free_slab, _mpio_cache);
+                m->mpio_pool = mempool_create_slab_pool(MIN_IOS, _mpio_cache);
                 if (!m->mpio_pool) {
                         kfree(m);
                         return NULL;
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index f3759dd7828e..7401540086df 100644
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -1174,8 +1174,7 @@ static int __init dm_snapshot_init(void)
                 goto bad4;
         }
 
-        pending_pool = mempool_create(128, mempool_alloc_slab,
-                                      mempool_free_slab, pending_cache);
+        pending_pool = mempool_create_slab_pool(128, pending_cache);
         if (!pending_pool) {
                 DMERR("Couldn't create pending pool.");
                 r = -ENOMEM;
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 8c82373f7ff3..a64798ef481e 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -823,13 +823,11 @@ static struct mapped_device *alloc_dev(unsigned int minor, int persistent)
         md->queue->unplug_fn = dm_unplug_all;
         md->queue->issue_flush_fn = dm_flush_all;
 
-        md->io_pool = mempool_create(MIN_IOS, mempool_alloc_slab,
-                                     mempool_free_slab, _io_cache);
+        md->io_pool = mempool_create_slab_pool(MIN_IOS, _io_cache);
         if (!md->io_pool)
                 goto bad2;
 
-        md->tio_pool = mempool_create(MIN_IOS, mempool_alloc_slab,
-                                      mempool_free_slab, _tio_cache);
+        md->tio_pool = mempool_create_slab_pool(MIN_IOS, _tio_cache);
         if (!md->tio_pool)
                 goto bad3;
 
diff --git a/drivers/md/kcopyd.c b/drivers/md/kcopyd.c
index 0d54e8b7d9de..9dcb2c8a3853 100644
--- a/drivers/md/kcopyd.c
+++ b/drivers/md/kcopyd.c
@@ -227,8 +227,7 @@ static int jobs_init(void)
         if (!_job_cache)
                 return -ENOMEM;
 
-        _job_pool = mempool_create(MIN_JOBS, mempool_alloc_slab,
-                                   mempool_free_slab, _job_cache);
+        _job_pool = mempool_create_slab_pool(MIN_JOBS, _job_cache);
         if (!_job_pool) {
                 kmem_cache_destroy(_job_cache);
                 return -ENOMEM;
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c
index b09fb6307153..7d4c5497785b 100644
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
@@ -1179,10 +1179,9 @@ static int __init i2o_block_init(void)
                 goto exit;
         }
 
-        i2o_blk_req_pool.pool = mempool_create(I2O_BLOCK_REQ_MEMPOOL_SIZE,
-                                               mempool_alloc_slab,
-                                               mempool_free_slab,
-                                               i2o_blk_req_pool.slab);
+        i2o_blk_req_pool.pool =
+                mempool_create_slab_pool(I2O_BLOCK_REQ_MEMPOOL_SIZE,
+                                         i2o_blk_req_pool.slab);
         if (!i2o_blk_req_pool.pool) {
                 osm_err("can't init request mempool\n");
                 rc = -ENOMEM;
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index 7b82ff090d42..2068b66822b7 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -3200,8 +3200,8 @@ iscsi_r2tpool_alloc(struct iscsi_session *session)
                  * Data-Out PDU's within R2T-sequence can be quite big;
                  * using mempool
                  */
-                ctask->datapool = mempool_create(ISCSI_DTASK_DEFAULT_MAX,
-                         mempool_alloc_slab, mempool_free_slab, taskcache);
+                ctask->datapool = mempool_create_slab_pool(ISCSI_DTASK_DEFAULT_MAX,
+                                                           taskcache);
                 if (ctask->datapool == NULL) {
                         kfifo_free(ctask->r2tqueue);
                         iscsi_pool_free(&ctask->r2tpool, (void**)ctask->r2ts);
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 029bbf461bb2..017729c59a49 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -2154,8 +2154,7 @@ qla2x00_allocate_sp_pool(scsi_qla_host_t *ha)
         int      rval;
 
         rval = QLA_SUCCESS;
-        ha->srb_mempool = mempool_create(SRB_MIN_REQ, mempool_alloc_slab,
-            mempool_free_slab, srb_cachep);
+        ha->srb_mempool = mempool_create_slab_pool(SRB_MIN_REQ, srb_cachep);
         if (ha->srb_mempool == NULL) {
                 qla_printk(KERN_INFO, ha, "Unable to allocate SRB mempool.\n");
                 rval = QLA_FUNCTION_FAILED;
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index ede158d08d9d..8f010a314a3d 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1787,9 +1787,8 @@ int __init scsi_init_queue(void)
                                         sgp->name);
                 }
 
-                sgp->pool = mempool_create(SG_MEMPOOL_SIZE,
-                                mempool_alloc_slab, mempool_free_slab,
-                                sgp->slab);
+                sgp->pool = mempool_create_slab_pool(SG_MEMPOOL_SIZE,
+                                                     sgp->slab);
                 if (!sgp->pool) {
                         printk(KERN_ERR "SCSI: can't init sg mempool %s\n",
                                         sgp->name);