[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>

3 files changed, 5 insertions, 7 deletions

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);