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

2 files changed, 6 insertions, 12 deletions

diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index 3961524fd4ab..624ca7146b6b 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -663,10 +663,8 @@ int nfs_init_readpagecache(void)
         if (nfs_rdata_cachep == NULL)
                 return -ENOMEM;
 
-        nfs_rdata_mempool = mempool_create(MIN_POOL_READ,
-                                           mempool_alloc_slab,
-                                           mempool_free_slab,
-                                           nfs_rdata_cachep);
+        nfs_rdata_mempool = mempool_create_slab_pool(MIN_POOL_READ,
+                                                     nfs_rdata_cachep);
         if (nfs_rdata_mempool == NULL)
                 return -ENOMEM;
 
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 3f5225404c97..4cfada2cc09f 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1521,17 +1521,13 @@ int nfs_init_writepagecache(void)
         if (nfs_wdata_cachep == NULL)
                 return -ENOMEM;
 
-        nfs_wdata_mempool = mempool_create(MIN_POOL_WRITE,
-                                           mempool_alloc_slab,
-                                           mempool_free_slab,
-                                           nfs_wdata_cachep);
+        nfs_wdata_mempool = mempool_create_slab_pool(MIN_POOL_WRITE,
+                                                     nfs_wdata_cachep);
         if (nfs_wdata_mempool == NULL)
                 return -ENOMEM;
 
-        nfs_commit_mempool = mempool_create(MIN_POOL_COMMIT,
-                                           mempool_alloc_slab,
-                                           mempool_free_slab,
-                                           nfs_wdata_cachep);
+        nfs_commit_mempool = mempool_create_slab_pool(MIN_POOL_COMMIT,
+                                                      nfs_wdata_cachep);
         if (nfs_commit_mempool == NULL)
                 return -ENOMEM;