mm: Remove slab destructors from kmem_cache_create().

Slab destructors were no longer supported after Christoph's
c59def9f222d44bb7e2f0a559f2906191a0862d7 change. They've been
BUGs for both slab and slub, and slob never supported them
either.

This rips out support for the dtor pointer from kmem_cache_create()
completely and fixes up every single callsite in the kernel (there were
about 224, not including the slab allocator definitions themselves,
or the documentation references).

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

72 files changed, 119 insertions, 125 deletions

diff --git a/fs/adfs/super.c b/fs/adfs/super.c
index de2ed5ca3351..1c9fd3029496 100644
--- a/fs/adfs/super.c
+++ b/fs/adfs/super.c
@@ -234,14 +234,14 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
 
         inode_init_once(&ei->vfs_inode);
 }
- 
+
 static int init_inodecache(void)
 {
         adfs_inode_cachep = kmem_cache_create("adfs_inode_cache",
                                              sizeof(struct adfs_inode_info),
                                              0, (SLAB_RECLAIM_ACCOUNT|
                                                 SLAB_MEM_SPREAD),
-                                             init_once, NULL);
+                                             init_once);
         if (adfs_inode_cachep == NULL)
                 return -ENOMEM;
         return 0;
diff --git a/fs/affs/super.c b/fs/affs/super.c
index 6d0ebc321530..c80191ae2059 100644
--- a/fs/affs/super.c
+++ b/fs/affs/super.c
@@ -99,7 +99,7 @@ static int init_inodecache(void)
                                              sizeof(struct affs_inode_info),
                                              0, (SLAB_RECLAIM_ACCOUNT|
                                                 SLAB_MEM_SPREAD),
-                                             init_once, NULL);
+                                             init_once);
         if (affs_inode_cachep == NULL)
                 return -ENOMEM;
         return 0;
diff --git a/fs/afs/super.c b/fs/afs/super.c
index 993cdf1cce3a..b8808b40f82b 100644
--- a/fs/afs/super.c
+++ b/fs/afs/super.c
@@ -89,8 +89,7 @@ int __init afs_fs_init(void)
                                              sizeof(struct afs_vnode),
                                              0,
                                              SLAB_HWCACHE_ALIGN,
-                                             afs_i_init_once,
-                                             NULL);
+                                             afs_i_init_once);
         if (!afs_inode_cachep) {
                 printk(KERN_NOTICE "kAFS: Failed to allocate inode cache\n");
                 return ret;
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
index a5c5171c2828..a45141827681 100644
--- a/fs/befs/linuxvfs.c
+++ b/fs/befs/linuxvfs.c
@@ -414,7 +414,7 @@ befs_read_inode(struct inode *inode)
 }
 
 /* Initialize the inode cache. Called at fs setup.
- * 
+ *
  * Taken from NFS implementation by Al Viro.
  */
 static int
@@ -424,7 +424,7 @@ befs_init_inodecache(void)
                                               sizeof (struct befs_inode_info),
                                               0, (SLAB_RECLAIM_ACCOUNT|
                                                 SLAB_MEM_SPREAD),
-                                              init_once, NULL);
+                                              init_once);
         if (befs_inode_cachep == NULL) {
                 printk(KERN_ERR "befs_init_inodecache: "
                        "Couldn't initalize inode slabcache\n");
diff --git a/fs/bfs/inode.c b/fs/bfs/inode.c
index 58c7bd9f5301..f346eb14e86f 100644
--- a/fs/bfs/inode.c
+++ b/fs/bfs/inode.c
@@ -250,14 +250,14 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
 
         inode_init_once(&bi->vfs_inode);
 }
- 
+
 static int init_inodecache(void)
 {
         bfs_inode_cachep = kmem_cache_create("bfs_inode_cache",
                                              sizeof(struct bfs_inode_info),
                                              0, (SLAB_RECLAIM_ACCOUNT|
                                                 SLAB_MEM_SPREAD),
-                                             init_once, NULL);
+                                             init_once);
         if (bfs_inode_cachep == NULL)
                 return -ENOMEM;
         return 0;
diff --git a/fs/bio.c b/fs/bio.c
index 33e46340a766..0d2c2d38b7ba 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -1187,7 +1187,7 @@ static void __init biovec_init_slabs(void)
 
                 size = bvs->nr_vecs * sizeof(struct bio_vec);
                 bvs->slab = kmem_cache_create(bvs->name, size, 0,
-                                SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL);
+                                SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
         }
 }
 
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 3635315e3b99..2980eabe5779 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -517,7 +517,7 @@ void __init bdev_cache_init(void)
         bdev_cachep = kmem_cache_create("bdev_cache", sizeof(struct bdev_inode),
                         0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
                                 SLAB_MEM_SPREAD|SLAB_PANIC),
-                        init_once, NULL);
+                        init_once);
         err = register_filesystem(&bd_type);
         if (err)
                 panic("Cannot register bdev pseudo-fs");
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 1fd0dc85f53c..cabb6a55d7dd 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -719,7 +719,7 @@ cifs_init_inodecache(void)
                                               sizeof (struct cifsInodeInfo),
                                               0, (SLAB_RECLAIM_ACCOUNT|
                                                 SLAB_MEM_SPREAD),
-                                              cifs_init_once, NULL);
+                                              cifs_init_once);
         if (cifs_inode_cachep == NULL)
                 return -ENOMEM;
 
@@ -748,7 +748,7 @@ cifs_init_request_bufs(void)
         cifs_req_cachep = kmem_cache_create("cifs_request",
                                             CIFSMaxBufSize +
                                             MAX_CIFS_HDR_SIZE, 0,
-                                            SLAB_HWCACHE_ALIGN, NULL, NULL);
+                                            SLAB_HWCACHE_ALIGN, NULL);
         if (cifs_req_cachep == NULL)
                 return -ENOMEM;
 
@@ -776,7 +776,7 @@ cifs_init_request_bufs(void)
         alloc of large cifs buffers even when page debugging is on */
         cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
                         MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
-                        NULL, NULL);
+                        NULL);
         if (cifs_sm_req_cachep == NULL) {
                 mempool_destroy(cifs_req_poolp);
                 kmem_cache_destroy(cifs_req_cachep);
@@ -817,7 +817,7 @@ cifs_init_mids(void)
 {
         cifs_mid_cachep = kmem_cache_create("cifs_mpx_ids",
                                 sizeof (struct mid_q_entry), 0,
-                                SLAB_HWCACHE_ALIGN, NULL, NULL);
+                                SLAB_HWCACHE_ALIGN, NULL);
         if (cifs_mid_cachep == NULL)
                 return -ENOMEM;
 
@@ -830,7 +830,7 @@ cifs_init_mids(void)
 
         cifs_oplock_cachep = kmem_cache_create("cifs_oplock_structs",
                                 sizeof (struct oplock_q_entry), 0,
-                                SLAB_HWCACHE_ALIGN, NULL, NULL);
+                                SLAB_HWCACHE_ALIGN, NULL);
         if (cifs_oplock_cachep == NULL) {
                 mempool_destroy(cifs_mid_poolp);
                 kmem_cache_destroy(cifs_mid_cachep);
diff --git a/fs/coda/inode.c b/fs/coda/inode.c
index 6771a4271e33..342f4e0d582e 100644
--- a/fs/coda/inode.c
+++ b/fs/coda/inode.c
@@ -64,13 +64,13 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
 
         inode_init_once(&ei->vfs_inode);
 }
- 
+
 int coda_init_inodecache(void)
 {
         coda_inode_cachep = kmem_cache_create("coda_inode_cache",
                                 sizeof(struct coda_inode_info),
                                 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
-                                init_once, NULL);
+                                init_once);
         if (coda_inode_cachep == NULL)
                 return -ENOMEM;
         return 0;
diff --git a/fs/configfs/mount.c b/fs/configfs/mount.c
index b00d962de833..871b0cb61839 100644
--- a/fs/configfs/mount.c
+++ b/fs/configfs/mount.c
@@ -136,7 +136,7 @@ static int __init configfs_init(void)
 
         configfs_dir_cachep = kmem_cache_create("configfs_dir_cache",
                                                 sizeof(struct configfs_dirent),
-                                                0, 0, NULL, NULL);
+                                                0, 0, NULL);
         if (!configfs_dir_cachep)
                 goto out;
 
diff --git a/fs/dcache.c b/fs/dcache.c
index cb9d05056b54..678d39deb607 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -2165,10 +2165,10 @@ void __init vfs_caches_init(unsigned long mempages)
         mempages -= reserve;
 
         names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
-                        SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL);
+                        SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
 
         filp_cachep = kmem_cache_create("filp", sizeof(struct file), 0,
-                        SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL);
+                        SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
 
         dcache_init(mempages);
         inode_init(mempages);
diff --git a/fs/dcookies.c b/fs/dcookies.c
index 21af1629f9bc..c1208f53bd74 100644
--- a/fs/dcookies.c
+++ b/fs/dcookies.c
@@ -205,7 +205,7 @@ static int dcookie_init(void)
 
         dcookie_cache = kmem_cache_create("dcookie_cache",
                 sizeof(struct dcookie_struct),
-                0, 0, NULL, NULL);
+                0, 0, NULL);
 
         if (!dcookie_cache)
                 goto out;
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 0553a6158dcb..dd362739d291 100644
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -1449,7 +1449,7 @@ int dlm_lowcomms_start(void)
         error = -ENOMEM;
         con_cache = kmem_cache_create("dlm_conn", sizeof(struct connection),
                                       __alignof__(struct connection), 0,
-                                      NULL, NULL);
+                                      NULL);
         if (!con_cache)
                 goto out;
 
diff --git a/fs/dlm/memory.c b/fs/dlm/memory.c
index fb9e2ee998ae..ecf0e5cb2035 100644
--- a/fs/dlm/memory.c
+++ b/fs/dlm/memory.c
@@ -23,7 +23,7 @@ int dlm_memory_init(void)
         int ret = 0;
 
         lkb_cache = kmem_cache_create("dlm_lkb", sizeof(struct dlm_lkb),
-                                __alignof__(struct dlm_lkb), 0, NULL, NULL);
+                                __alignof__(struct dlm_lkb), 0, NULL);
         if (!lkb_cache)
                 ret = -ENOMEM;
         return ret;
diff --git a/fs/dnotify.c b/fs/dnotify.c
index 936409fcd939..28d01ed66de0 100644
--- a/fs/dnotify.c
+++ b/fs/dnotify.c
@@ -176,7 +176,7 @@ EXPORT_SYMBOL_GPL(dnotify_parent);
 static int __init dnotify_init(void)
 {
         dn_cache = kmem_cache_create("dnotify_cache",
-                sizeof(struct dnotify_struct), 0, SLAB_PANIC, NULL, NULL);
+                sizeof(struct dnotify_struct), 0, SLAB_PANIC, NULL);
         return 0;
 }
 
diff --git a/fs/dquot.c b/fs/dquot.c
index 7e273151f589..de9a29f64ff3 100644
--- a/fs/dquot.c
+++ b/fs/dquot.c
@@ -1848,11 +1848,11 @@ static int __init dquot_init(void)
 
         register_sysctl_table(sys_table);
 
-        dquot_cachep = kmem_cache_create("dquot", 
+        dquot_cachep = kmem_cache_create("dquot",
                         sizeof(struct dquot), sizeof(unsigned long) * 4,
                         (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
                                 SLAB_MEM_SPREAD|SLAB_PANIC),
-                        NULL, NULL);
+                        NULL);
 
         order = 0;
         dquot_hash = (struct hlist_head *)__get_free_pages(GFP_ATOMIC, order);
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c
index 02ca6f1e55d7..e557a6766927 100644
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
@@ -677,7 +677,7 @@ static int ecryptfs_init_kmem_caches(void)
 
                 info = &ecryptfs_cache_infos[i];
                 *(info->cache) = kmem_cache_create(info->name, info->size,
-                                0, SLAB_HWCACHE_ALIGN, info->ctor, NULL);
+                                0, SLAB_HWCACHE_ALIGN, info->ctor);
                 if (!*(info->cache)) {
                         ecryptfs_free_kmem_caches();
                         ecryptfs_printk(KERN_WARNING, "%s: "
diff --git a/fs/efs/super.c b/fs/efs/super.c
index d360c81f3a72..ce4acb8ff819 100644
--- a/fs/efs/super.c
+++ b/fs/efs/super.c
@@ -75,13 +75,13 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
 
         inode_init_once(&ei->vfs_inode);
 }
- 
+
 static int init_inodecache(void)
 {
         efs_inode_cachep = kmem_cache_create("efs_inode_cache",
                                 sizeof(struct efs_inode_info),
                                 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
-                                init_once, NULL);
+                                init_once);
         if (efs_inode_cachep == NULL)
                 return -ENOMEM;
         return 0;
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 0b73cd45a06d..77b9953624f4 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -1324,12 +1324,12 @@ static int __init eventpoll_init(void)
         /* Allocates slab cache used to allocate "struct epitem" items */
         epi_cache = kmem_cache_create("eventpoll_epi", sizeof(struct epitem),
                         0, SLAB_HWCACHE_ALIGN|EPI_SLAB_DEBUG|SLAB_PANIC,
-                        NULL, NULL);
+                        NULL);
 
         /* Allocates slab cache used to allocate "struct eppoll_entry" */
         pwq_cache = kmem_cache_create("eventpoll_pwq",
                         sizeof(struct eppoll_entry), 0,
-                        EPI_SLAB_DEBUG|SLAB_PANIC, NULL, NULL);
+                        EPI_SLAB_DEBUG|SLAB_PANIC, NULL);
 
         return 0;
 }
diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index a6b1072daea7..68579a0ed3f0 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -167,14 +167,14 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
 #endif
         inode_init_once(&ei->vfs_inode);
 }
- 
+
 static int init_inodecache(void)
 {
         ext2_inode_cachep = kmem_cache_create("ext2_inode_cache",
                                              sizeof(struct ext2_inode_info),
                                              0, (SLAB_RECLAIM_ACCOUNT|
                                                 SLAB_MEM_SPREAD),
-                                             init_once, NULL);
+                                             init_once);
         if (ext2_inode_cachep == NULL)
                 return -ENOMEM;
         return 0;
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 4f84dc86628a..f0614e3f1fe8 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -490,7 +490,7 @@ static int init_inodecache(void)
                                              sizeof(struct ext3_inode_info),
                                              0, (SLAB_RECLAIM_ACCOUNT|
                                                 SLAB_MEM_SPREAD),
-                                             init_once, NULL);
+                                             init_once);
         if (ext3_inode_cachep == NULL)
                 return -ENOMEM;
         return 0;
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 6dcbb28dc06d..75adbb64e028 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -541,7 +541,7 @@ static int init_inodecache(void)
                                              sizeof(struct ext4_inode_info),
                                              0, (SLAB_RECLAIM_ACCOUNT|
                                                 SLAB_MEM_SPREAD),
-                                             init_once, NULL);
+                                             init_once);
         if (ext4_inode_cachep == NULL)
                 return -ENOMEM;
         return 0;
diff --git a/fs/fat/cache.c b/fs/fat/cache.c
index 3c9c8a15ec73..be6f89b152ca 100644
--- a/fs/fat/cache.c
+++ b/fs/fat/cache.c
@@ -48,7 +48,7 @@ int __init fat_cache_init(void)
         fat_cache_cachep = kmem_cache_create("fat_cache",
                                 sizeof(struct fat_cache),
                                 0, SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
-                                init_once, NULL);
+                                init_once);
         if (fat_cache_cachep == NULL)
                 return -ENOMEM;
         return 0;
diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 0a7ddb39a593..4baa5f205368 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -514,7 +514,7 @@ static int __init fat_init_inodecache(void)
                                              sizeof(struct msdos_inode_info),
                                              0, (SLAB_RECLAIM_ACCOUNT|
                                                 SLAB_MEM_SPREAD),
-                                             init_once, NULL);
+                                             init_once);
         if (fat_inode_cachep == NULL)
                 return -ENOMEM;
         return 0;
diff --git a/fs/fcntl.c b/fs/fcntl.c
index 3f22e9f4f691..78b2ff044054 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -638,7 +638,7 @@ EXPORT_SYMBOL(kill_fasync);
 static int __init fasync_init(void)
 {
         fasync_cache = kmem_cache_create("fasync_cache",
-                sizeof(struct fasync_struct), 0, SLAB_PANIC, NULL, NULL);
+                sizeof(struct fasync_struct), 0, SLAB_PANIC, NULL);
         return 0;
 }
 
diff --git a/fs/freevxfs/vxfs_super.c b/fs/freevxfs/vxfs_super.c
index 647d600f0bc8..4f95572d2722 100644
--- a/fs/freevxfs/vxfs_super.c
+++ b/fs/freevxfs/vxfs_super.c
@@ -263,8 +263,8 @@ vxfs_init(void)
         int rv;
 
         vxfs_inode_cachep = kmem_cache_create("vxfs_inode",
-                        sizeof(struct vxfs_inode_info), 0, 
-                        SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, NULL, NULL);
+                        sizeof(struct vxfs_inode_info), 0,
+                        SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, NULL);
         if (!vxfs_inode_cachep)
                 return -ENOMEM;
         rv = register_filesystem(&vxfs_fs_type);
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index 357764d85ff1..3ad22beb24c2 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -1044,7 +1044,7 @@ int __init fuse_dev_init(void)
         int err = -ENOMEM;
         fuse_req_cachep = kmem_cache_create("fuse_request",
                                             sizeof(struct fuse_req),
-                                            0, 0, NULL, NULL);
+                                            0, 0, NULL);
         if (!fuse_req_cachep)
                 goto out;
 
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index cc5efc13496a..5448f625ab56 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -706,7 +706,7 @@ static int __init fuse_fs_init(void)
         fuse_inode_cachep = kmem_cache_create("fuse_inode",
                                               sizeof(struct fuse_inode),
                                               0, SLAB_HWCACHE_ALIGN,
-                                              fuse_inode_init_once, NULL);
+                                              fuse_inode_init_once);
         err = -ENOMEM;
         if (!fuse_inode_cachep)
                 goto out_unreg2;
diff --git a/fs/gfs2/main.c b/fs/gfs2/main.c
index 787a0edef100..d5d4e68b8807 100644
--- a/fs/gfs2/main.c
+++ b/fs/gfs2/main.c
@@ -72,7 +72,7 @@ static int __init init_gfs2_fs(void)
         gfs2_glock_cachep = kmem_cache_create("gfs2_glock",
                                               sizeof(struct gfs2_glock),
                                               0, 0,
-                                              gfs2_init_glock_once, NULL);
+                                              gfs2_init_glock_once);
         if (!gfs2_glock_cachep)
                 goto fail;
 
@@ -80,13 +80,13 @@ static int __init init_gfs2_fs(void)
                                               sizeof(struct gfs2_inode),
                                               0,  SLAB_RECLAIM_ACCOUNT|
                                                   SLAB_MEM_SPREAD,
-                                              gfs2_init_inode_once, NULL);
+                                              gfs2_init_inode_once);
         if (!gfs2_inode_cachep)
                 goto fail;
 
         gfs2_bufdata_cachep = kmem_cache_create("gfs2_bufdata",
                                                 sizeof(struct gfs2_bufdata),
-                                                0, 0, NULL, NULL);
+                                                0, 0, NULL);
         if (!gfs2_bufdata_cachep)
                 goto fail;
 
diff --git a/fs/hfs/super.c b/fs/hfs/super.c
index 92cf8751e428..6c5f92dfb500 100644
--- a/fs/hfs/super.c
+++ b/fs/hfs/super.c
@@ -443,7 +443,7 @@ static int __init init_hfs_fs(void)
 
         hfs_inode_cachep = kmem_cache_create("hfs_inode_cache",
                 sizeof(struct hfs_inode_info), 0, SLAB_HWCACHE_ALIGN,
-                hfs_init_once, NULL);
+                hfs_init_once);
         if (!hfs_inode_cachep)
                 return -ENOMEM;
         err = register_filesystem(&hfs_fs_type);
diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c
index 6d87a2a9534d..7b0f2e5a44e2 100644
--- a/fs/hfsplus/super.c
+++ b/fs/hfsplus/super.c
@@ -479,7 +479,7 @@ static int __init init_hfsplus_fs(void)
 
         hfsplus_inode_cachep = kmem_cache_create("hfsplus_icache",
                 HFSPLUS_INODE_SIZE, 0, SLAB_HWCACHE_ALIGN,
-                hfsplus_init_once, NULL);
+                hfsplus_init_once);
         if (!hfsplus_inode_cachep)
                 return -ENOMEM;
         err = register_filesystem(&hfsplus_fs_type);
diff --git a/fs/hpfs/super.c b/fs/hpfs/super.c
index 29cc34abb2ea..89612ee7c80d 100644
--- a/fs/hpfs/super.c
+++ b/fs/hpfs/super.c
@@ -181,14 +181,14 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
         mutex_init(&ei->i_parent_mutex);
         inode_init_once(&ei->vfs_inode);
 }
- 
+
 static int init_inodecache(void)
 {
         hpfs_inode_cachep = kmem_cache_create("hpfs_inode_cache",
                                              sizeof(struct hpfs_inode_info),
                                              0, (SLAB_RECLAIM_ACCOUNT|
                                                 SLAB_MEM_SPREAD),
-                                             init_once, NULL);
+                                             init_once);
         if (hpfs_inode_cachep == NULL)
                 return -ENOMEM;
         return 0;
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index d145cb79c30a..c848a191525d 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -848,7 +848,7 @@ static int __init init_hugetlbfs_fs(void)
 
         hugetlbfs_inode_cachep = kmem_cache_create("hugetlbfs_inode_cache",
                                         sizeof(struct hugetlbfs_inode_info),
-                                        0, 0, init_once, NULL);
+                                        0, 0, init_once);
         if (hugetlbfs_inode_cachep == NULL)
                 return -ENOMEM;
 
diff --git a/fs/inode.c b/fs/inode.c
index 320e088d0b28..29f5068f819b 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1388,8 +1388,7 @@ void __init inode_init(unsigned long mempages)
                                          0,
                                          (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
                                          SLAB_MEM_SPREAD),
-                                         init_once,
-                                         NULL);
+                                         init_once);
         register_shrinker(&icache_shrinker);
 
         /* Hash may have been set up in inode_init_early */
diff --git a/fs/inotify_user.c b/fs/inotify_user.c
index 9f2224f65a18..9bf2f6c09df6 100644
--- a/fs/inotify_user.c
+++ b/fs/inotify_user.c
@@ -716,10 +716,10 @@ static int __init inotify_user_setup(void)
 
         watch_cachep = kmem_cache_create("inotify_watch_cache",
                                          sizeof(struct inotify_user_watch),
-                                         0, SLAB_PANIC, NULL, NULL);
+                                         0, SLAB_PANIC, NULL);
         event_cachep = kmem_cache_create("inotify_event_cache",
                                          sizeof(struct inotify_kernel_event),
-                                         0, SLAB_PANIC, NULL, NULL);
+                                         0, SLAB_PANIC, NULL);
 
         return 0;
 }
diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c
index 4f5418be0590..95c72aa81867 100644
--- a/fs/isofs/inode.c
+++ b/fs/isofs/inode.c
@@ -86,7 +86,7 @@ static int init_inodecache(void)
                                         sizeof(struct iso_inode_info),
                                         0, (SLAB_RECLAIM_ACCOUNT|
                                         SLAB_MEM_SPREAD),
-                                        init_once, NULL);
+                                        init_once);
         if (isofs_inode_cachep == NULL)
                 return -ENOMEM;
         return 0;
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c
index 46fe7439fb91..06ab3c10b1b8 100644
--- a/fs/jbd/journal.c
+++ b/fs/jbd/journal.c
@@ -1668,7 +1668,7 @@ static int journal_create_jbd_slab(size_t slab_size)
          * boundary.
          */
         jbd_slab[i] = kmem_cache_create(jbd_slab_names[i],
-                                slab_size, slab_size, 0, NULL, NULL);
+                                slab_size, slab_size, 0, NULL);
         if (!jbd_slab[i]) {
                 printk(KERN_EMERG "JBD: no memory for jbd_slab cache\n");
                 return -ENOMEM;
@@ -1711,8 +1711,7 @@ static int journal_init_journal_head_cache(void)
                                 sizeof(struct journal_head),
                                 0,              /* offset */
                                 0,              /* flags */
-                                NULL,           /* ctor */
-                                NULL);          /* dtor */
+                                NULL);          /* ctor */
         retval = 0;
         if (journal_head_cache == 0) {
                 retval = -ENOMEM;
@@ -2008,8 +2007,7 @@ static int __init journal_init_handle_cache(void)
                                 sizeof(handle_t),
                                 0,              /* offset */
                                 0,              /* flags */
-                                NULL,           /* ctor */
-                                NULL);          /* dtor */
+                                NULL);          /* ctor */
         if (jbd_handle_cache == NULL) {
                 printk(KERN_EMERG "JBD: failed to create handle cache\n");
                 return -ENOMEM;
diff --git a/fs/jbd/revoke.c b/fs/jbd/revoke.c
index 8db2fa25170b..62e13c8db132 100644
--- a/fs/jbd/revoke.c
+++ b/fs/jbd/revoke.c
@@ -170,13 +170,13 @@ int __init journal_init_revoke_caches(void)
 {
         revoke_record_cache = kmem_cache_create("revoke_record",
                                            sizeof(struct jbd_revoke_record_s),
-                                           0, SLAB_HWCACHE_ALIGN, NULL, NULL);
+                                           0, SLAB_HWCACHE_ALIGN, NULL);
         if (revoke_record_cache == 0)
                 return -ENOMEM;
 
         revoke_table_cache = kmem_cache_create("revoke_table",
                                            sizeof(struct jbd_revoke_table_s),
-                                           0, 0, NULL, NULL);
+                                           0, 0, NULL);
         if (revoke_table_cache == 0) {
                 kmem_cache_destroy(revoke_record_cache);
                 revoke_record_cache = NULL;
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index f290cb7cb834..f37324aee817 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -1680,7 +1680,7 @@ static int jbd2_journal_create_jbd_slab(size_t slab_size)
          * boundary.
          */
         jbd_slab[i] = kmem_cache_create(jbd_slab_names[i],
-                                slab_size, slab_size, 0, NULL, NULL);
+                                slab_size, slab_size, 0, NULL);
         if (!jbd_slab[i]) {
                 printk(KERN_EMERG "JBD: no memory for jbd_slab cache\n");
                 return -ENOMEM;
@@ -1723,8 +1723,7 @@ static int journal_init_jbd2_journal_head_cache(void)
                                 sizeof(struct journal_head),
                                 0,              /* offset */
                                 0,              /* flags */
-                                NULL,           /* ctor */
-                                NULL);          /* dtor */
+                                NULL);          /* ctor */
         retval = 0;
         if (jbd2_journal_head_cache == 0) {
                 retval = -ENOMEM;
@@ -2006,8 +2005,7 @@ static int __init journal_init_handle_cache(void)
                                 sizeof(handle_t),
                                 0,              /* offset */
                                 0,              /* flags */
-                                NULL,           /* ctor */
-                                NULL);          /* dtor */
+                                NULL);          /* ctor */
         if (jbd2_handle_cache == NULL) {
                 printk(KERN_EMERG "JBD: failed to create handle cache\n");
                 return -ENOMEM;
diff --git a/fs/jbd2/revoke.c b/fs/jbd2/revoke.c
index 28cac049a56b..01d88975e0c5 100644
--- a/fs/jbd2/revoke.c
+++ b/fs/jbd2/revoke.c
@@ -171,13 +171,13 @@ int __init jbd2_journal_init_revoke_caches(void)
 {
         jbd2_revoke_record_cache = kmem_cache_create("jbd2_revoke_record",
                                            sizeof(struct jbd2_revoke_record_s),
-                                           0, SLAB_HWCACHE_ALIGN, NULL, NULL);
+                                           0, SLAB_HWCACHE_ALIGN, NULL);
         if (jbd2_revoke_record_cache == 0)
                 return -ENOMEM;
 
         jbd2_revoke_table_cache = kmem_cache_create("jbd2_revoke_table",
                                            sizeof(struct jbd2_revoke_table_s),
-                                           0, 0, NULL, NULL);
+                                           0, 0, NULL);
         if (jbd2_revoke_table_cache == 0) {
                 kmem_cache_destroy(jbd2_revoke_record_cache);
                 jbd2_revoke_record_cache = NULL;
diff --git a/fs/jffs2/malloc.c b/fs/jffs2/malloc.c
index 35c1a5e30ba1..f9211252b5f1 100644
--- a/fs/jffs2/malloc.c
+++ b/fs/jffs2/malloc.c
@@ -33,56 +33,56 @@ int __init jffs2_create_slab_caches(void)
 {
         full_dnode_slab = kmem_cache_create("jffs2_full_dnode",
                                             sizeof(struct jffs2_full_dnode),
-                                            0, 0, NULL, NULL);
+                                            0, 0, NULL);
         if (!full_dnode_slab)
                 goto err;
 
         raw_dirent_slab = kmem_cache_create("jffs2_raw_dirent",
                                             sizeof(struct jffs2_raw_dirent),
-                                            0, 0, NULL, NULL);
+                                            0, 0, NULL);
         if (!raw_dirent_slab)
                 goto err;
 
         raw_inode_slab = kmem_cache_create("jffs2_raw_inode",
                                            sizeof(struct jffs2_raw_inode),
-                                           0, 0, NULL, NULL);
+                                           0, 0, NULL);
         if (!raw_inode_slab)
                 goto err;
 
         tmp_dnode_info_slab = kmem_cache_create("jffs2_tmp_dnode",
                                                 sizeof(struct jffs2_tmp_dnode_info),
-                                                0, 0, NULL, NULL);
+                                                0, 0, NULL);
         if (!tmp_dnode_info_slab)
                 goto err;
 
         raw_node_ref_slab = kmem_cache_create("jffs2_refblock",
                                               sizeof(struct jffs2_raw_node_ref) * (REFS_PER_BLOCK + 1),
-                                              0, 0, NULL, NULL);
+                                              0, 0, NULL);
         if (!raw_node_ref_slab)
                 goto err;
 
         node_frag_slab = kmem_cache_create("jffs2_node_frag",
                                            sizeof(struct jffs2_node_frag),
-                                           0, 0, NULL, NULL);
+                                           0, 0, NULL);
         if (!node_frag_slab)
                 goto err;
 
         inode_cache_slab = kmem_cache_create("jffs2_inode_cache",
                                              sizeof(struct jffs2_inode_cache),
-                                             0, 0, NULL, NULL);
+                                             0, 0, NULL);
         if (!inode_cache_slab)
                 goto err;
 
 #ifdef CONFIG_JFFS2_FS_XATTR
         xattr_datum_cache = kmem_cache_create("jffs2_xattr_datum",
                                              sizeof(struct jffs2_xattr_datum),
-                                             0, 0, NULL, NULL);
+                                             0, 0, NULL);
         if (!xattr_datum_cache)
                 goto err;
 
         xattr_ref_cache = kmem_cache_create("jffs2_xattr_ref",
                                            sizeof(struct jffs2_xattr_ref),
-                                           0, 0, NULL, NULL);
+                                           0, 0, NULL);
         if (!xattr_ref_cache)
                 goto err;
 #endif
diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c
index e220d3bd610d..be2b70c2ec16 100644
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
@@ -192,7 +192,7 @@ static int __init init_jffs2_fs(void)
                                              sizeof(struct jffs2_inode_info),
                                              0, (SLAB_RECLAIM_ACCOUNT|
                                                 SLAB_MEM_SPREAD),
-                                             jffs2_i_init_once, NULL);
+                                             jffs2_i_init_once);
         if (!jffs2_inode_cachep) {
                 printk(KERN_ERR "JFFS2 error: Failed to initialise inode cache\n");
                 return -ENOMEM;
diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c
index 77c7f1129dde..62e96be02acf 100644
--- a/fs/jfs/jfs_metapage.c
+++ b/fs/jfs/jfs_metapage.c
@@ -213,7 +213,7 @@ int __init metapage_init(void)
          * Allocate the metapage structures
          */
         metapage_cache = kmem_cache_create("jfs_mp", sizeof(struct metapage),
-                                           0, 0, init_once, NULL);
+                                           0, 0, init_once);
         if (metapage_cache == NULL)
                 return -ENOMEM;
 
diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 929fceca7999..4b372f550652 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -776,7 +776,7 @@ static int __init init_jfs_fs(void)
         jfs_inode_cachep =
             kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
                             SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
-                            init_once, NULL);
+                            init_once);
         if (jfs_inode_cachep == NULL)
                 return -ENOMEM;
 
diff --git a/fs/locks.c b/fs/locks.c
index 4f2d749ac624..310510637247 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -2276,7 +2276,7 @@ static int __init filelock_init(void)
 {
         filelock_cache = kmem_cache_create("file_lock_cache",
                         sizeof(struct file_lock), 0, SLAB_PANIC,
-                        init_once, NULL);
+                        init_once);
         return 0;
 }
 
diff --git a/fs/mbcache.c b/fs/mbcache.c
index fbb1d02f8791..1046cbefbfbf 100644
--- a/fs/mbcache.c
+++ b/fs/mbcache.c
@@ -292,7 +292,7 @@ mb_cache_create(const char *name, struct mb_cache_op *cache_op,
                         INIT_LIST_HEAD(&cache->c_indexes_hash[m][n]);
         }
         cache->c_entry_cache = kmem_cache_create(name, entry_size, 0,
-                SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, NULL, NULL);
+                SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, NULL);
         if (!cache->c_entry_cache)
                 goto fail;
 
diff --git a/fs/minix/inode.c b/fs/minix/inode.c
index be4044614ac8..43668d7d668f 100644
--- a/fs/minix/inode.c
+++ b/fs/minix/inode.c
@@ -75,14 +75,14 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
 
         inode_init_once(&ei->vfs_inode);
 }
- 
+
 static int init_inodecache(void)
 {
         minix_inode_cachep = kmem_cache_create("minix_inode_cache",
                                              sizeof(struct minix_inode_info),
                                              0, (SLAB_RECLAIM_ACCOUNT|
                                                 SLAB_MEM_SPREAD),
-                                             init_once, NULL);
+                                             init_once);
         if (minix_inode_cachep == NULL)
                 return -ENOMEM;
         return 0;
diff --git a/fs/namespace.c b/fs/namespace.c
index 4198003d7e18..ddbda13c2d31 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1801,7 +1801,7 @@ void __init mnt_init(unsigned long mempages)
         init_rwsem(&namespace_sem);
 
         mnt_cache = kmem_cache_create("mnt_cache", sizeof(struct vfsmount),
-                        0, SLAB_HWCACHE_ALIGN | SLAB_PANIC, NULL, NULL);
+                        0, SLAB_HWCACHE_ALIGN | SLAB_PANIC, NULL);
 
         mount_hashtable = (struct list_head *)__get_free_page(GFP_ATOMIC);
 
diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c
index cf06eb9f050e..7f8536dbdedc 100644
--- a/fs/ncpfs/inode.c
+++ b/fs/ncpfs/inode.c
@@ -63,14 +63,14 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
         mutex_init(&ei->open_mutex);
         inode_init_once(&ei->vfs_inode);
 }
- 
+
 static int init_inodecache(void)
 {
         ncp_inode_cachep = kmem_cache_create("ncp_inode_cache",
                                              sizeof(struct ncp_inode_info),
                                              0, (SLAB_RECLAIM_ACCOUNT|
                                                 SLAB_MEM_SPREAD),
-                                             init_once, NULL);
+                                             init_once);
         if (ncp_inode_cachep == NULL)
                 return -ENOMEM;
         return 0;
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index a5c82b6f3b45..fcf4d384610e 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -875,7 +875,7 @@ int __init nfs_init_directcache(void)
                                                 sizeof(struct nfs_direct_req),
                                                 0, (SLAB_RECLAIM_ACCOUNT|
                                                         SLAB_MEM_SPREAD),
-                                                NULL, NULL);
+                                                NULL);
         if (nfs_direct_cachep == NULL)
                 return -ENOMEM;
 
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 3d9fccf4ef93..bca6cdcb9f0d 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -1165,14 +1165,14 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
         nfsi->npages = 0;
         nfs4_init_once(nfsi);
 }
- 
+
 static int __init nfs_init_inodecache(void)
 {
         nfs_inode_cachep = kmem_cache_create("nfs_inode_cache",
                                              sizeof(struct nfs_inode),
                                              0, (SLAB_RECLAIM_ACCOUNT|
                                                 SLAB_MEM_SPREAD),
-                                             init_once, NULL);
+                                             init_once);
         if (nfs_inode_cachep == NULL)
                 return -ENOMEM;
 
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index f56dae5216f4..345bb9b4765b 100644
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -442,7 +442,7 @@ int __init nfs_init_nfspagecache(void)
         nfs_page_cachep = kmem_cache_create("nfs_page",
                                             sizeof(struct nfs_page),
                                             0, SLAB_HWCACHE_ALIGN,
-                                            NULL, NULL);
+                                            NULL);
         if (nfs_page_cachep == NULL)
                 return -ENOMEM;
 
diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index 6ae2e58ed05a..19e05633f4e3 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -598,7 +598,7 @@ int __init nfs_init_readpagecache(void)
         nfs_rdata_cachep = kmem_cache_create("nfs_read_data",
                                              sizeof(struct nfs_read_data),
                                              0, SLAB_HWCACHE_ALIGN,
-                                             NULL, NULL);
+                                             NULL);
         if (nfs_rdata_cachep == NULL)
                 return -ENOMEM;
 
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 73ac992ece85..ef97e0c0f5b1 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1467,7 +1467,7 @@ int __init nfs_init_writepagecache(void)
         nfs_wdata_cachep = kmem_cache_create("nfs_write_data",
                                              sizeof(struct nfs_write_data),
                                              0, SLAB_HWCACHE_ALIGN,
-                                             NULL, NULL);
+                                             NULL);
         if (nfs_wdata_cachep == NULL)
                 return -ENOMEM;
 
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 6284807bd37e..3f559700788f 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1032,19 +1032,19 @@ static int
 nfsd4_init_slabs(void)
 {
         stateowner_slab = kmem_cache_create("nfsd4_stateowners",
-                        sizeof(struct nfs4_stateowner), 0, 0, NULL, NULL);
+                        sizeof(struct nfs4_stateowner), 0, 0, NULL);
         if (stateowner_slab == NULL)
                 goto out_nomem;
         file_slab = kmem_cache_create("nfsd4_files",
-                        sizeof(struct nfs4_file), 0, 0, NULL, NULL);
+                        sizeof(struct nfs4_file), 0, 0, NULL);
         if (file_slab == NULL)
                 goto out_nomem;
         stateid_slab = kmem_cache_create("nfsd4_stateids",
-                        sizeof(struct nfs4_stateid), 0, 0, NULL, NULL);
+                        sizeof(struct nfs4_stateid), 0, 0, NULL);
         if (stateid_slab == NULL)
                 goto out_nomem;
         deleg_slab = kmem_cache_create("nfsd4_delegations",
-                        sizeof(struct nfs4_delegation), 0, 0, NULL, NULL);
+                        sizeof(struct nfs4_delegation), 0, 0, NULL);
         if (deleg_slab == NULL)
                 goto out_nomem;
         return 0;
diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
index 4566b9182551..90c4e3a29706 100644
--- a/fs/ntfs/super.c
+++ b/fs/ntfs/super.c
@@ -3143,7 +3143,7 @@ static int __init init_ntfs_fs(void)
 
         ntfs_index_ctx_cache = kmem_cache_create(ntfs_index_ctx_cache_name,
                         sizeof(ntfs_index_context), 0 /* offset */,
-                        SLAB_HWCACHE_ALIGN, NULL /* ctor */, NULL /* dtor */);
+                        SLAB_HWCACHE_ALIGN, NULL /* ctor */);
         if (!ntfs_index_ctx_cache) {
                 printk(KERN_CRIT "NTFS: Failed to create %s!\n",
                                 ntfs_index_ctx_cache_name);
@@ -3151,7 +3151,7 @@ static int __init init_ntfs_fs(void)
         }
         ntfs_attr_ctx_cache = kmem_cache_create(ntfs_attr_ctx_cache_name,
                         sizeof(ntfs_attr_search_ctx), 0 /* offset */,
-                        SLAB_HWCACHE_ALIGN, NULL /* ctor */, NULL /* dtor */);
+                        SLAB_HWCACHE_ALIGN, NULL /* ctor */);
         if (!ntfs_attr_ctx_cache) {
                 printk(KERN_CRIT "NTFS: Failed to create %s!\n",
                                 ntfs_attr_ctx_cache_name);
@@ -3160,7 +3160,7 @@ static int __init init_ntfs_fs(void)
 
         ntfs_name_cache = kmem_cache_create(ntfs_name_cache_name,
                         (NTFS_MAX_NAME_LEN+1) * sizeof(ntfschar), 0,
-                        SLAB_HWCACHE_ALIGN, NULL, NULL);
+                        SLAB_HWCACHE_ALIGN, NULL);
         if (!ntfs_name_cache) {
                 printk(KERN_CRIT "NTFS: Failed to create %s!\n",
                                 ntfs_name_cache_name);
@@ -3169,7 +3169,7 @@ static int __init init_ntfs_fs(void)
 
         ntfs_inode_cache = kmem_cache_create(ntfs_inode_cache_name,
                         sizeof(ntfs_inode), 0,
-                        SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, NULL, NULL);
+                        SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD, NULL);
         if (!ntfs_inode_cache) {
                 printk(KERN_CRIT "NTFS: Failed to create %s!\n",
                                 ntfs_inode_cache_name);
@@ -3179,7 +3179,7 @@ static int __init init_ntfs_fs(void)
         ntfs_big_inode_cache = kmem_cache_create(ntfs_big_inode_cache_name,
                         sizeof(big_ntfs_inode), 0,
                         SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
-                        ntfs_big_inode_init_once, NULL);
+                        ntfs_big_inode_init_once);
         if (!ntfs_big_inode_cache) {
                 printk(KERN_CRIT "NTFS: Failed to create %s!\n",
                                 ntfs_big_inode_cache_name);
diff --git a/fs/ocfs2/dlm/dlmfs.c b/fs/ocfs2/dlm/dlmfs.c
index fd8cb1badc9b..7418dc83de1c 100644
--- a/fs/ocfs2/dlm/dlmfs.c
+++ b/fs/ocfs2/dlm/dlmfs.c
@@ -592,7 +592,7 @@ static int __init init_dlmfs_fs(void)
                                 sizeof(struct dlmfs_inode_private),
                                 0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
                                         SLAB_MEM_SPREAD),
-                                dlmfs_init_once, NULL);
+                                dlmfs_init_once);
         if (!dlmfs_inode_cache)
                 return -ENOMEM;
         cleanup_inode = 1;
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index 65b2b9b92688..62e4a7daa286 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -510,7 +510,7 @@ int dlm_init_mle_cache(void)
         dlm_mle_cache = kmem_cache_create("dlm_mle_cache",
                                           sizeof(struct dlm_master_list_entry),
                                           0, SLAB_HWCACHE_ALIGN,
-                                          NULL, NULL);
+                                          NULL);
         if (dlm_mle_cache == NULL)
                 return -ENOMEM;
         return 0;
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 3a5a1ed09ac9..200c7d4790dc 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -984,7 +984,7 @@ static int ocfs2_initialize_mem_caches(void)
                                        0,
                                        (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
                                                 SLAB_MEM_SPREAD),
-                                       ocfs2_inode_init_once, NULL);
+                                       ocfs2_inode_init_once);
         if (!ocfs2_inode_cachep)
                 return -ENOMEM;
 
diff --git a/fs/ocfs2/uptodate.c b/fs/ocfs2/uptodate.c
index 39814b900fc0..4da8851f2b23 100644
--- a/fs/ocfs2/uptodate.c
+++ b/fs/ocfs2/uptodate.c
@@ -548,7 +548,7 @@ int __init init_ocfs2_uptodate_cache(void)
 {
         ocfs2_uptodate_cachep = kmem_cache_create("ocfs2_uptodate",
                                   sizeof(struct ocfs2_meta_cache_item),
-                                  0, SLAB_HWCACHE_ALIGN, NULL, NULL);
+                                  0, SLAB_HWCACHE_ALIGN, NULL);
         if (!ocfs2_uptodate_cachep)
                 return -ENOMEM;
 
diff --git a/fs/openpromfs/inode.c b/fs/openpromfs/inode.c
index e62397341c36..dd86be2aa6c9 100644
--- a/fs/openpromfs/inode.c
+++ b/fs/openpromfs/inode.c
@@ -431,7 +431,7 @@ static int __init init_openprom_fs(void)
                                             0,
                                             (SLAB_RECLAIM_ACCOUNT |
                                              SLAB_MEM_SPREAD),
-                                            op_inode_init_once, NULL);
+                                            op_inode_init_once);
         if (!op_inode_cachep)
                 return -ENOMEM;
 
diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index dd28e86ab422..94e2c1adf184 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -112,14 +112,14 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
 
         inode_init_once(&ei->vfs_inode);
 }
- 
+
 int __init proc_init_inodecache(void)
 {
         proc_inode_cachep = kmem_cache_create("proc_inode_cache",
                                              sizeof(struct proc_inode),
                                              0, (SLAB_RECLAIM_ACCOUNT|
                                                 SLAB_MEM_SPREAD),
-                                             init_once, NULL);
+                                             init_once);
         if (proc_inode_cachep == NULL)
                 return -ENOMEM;
         return 0;
diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c
index 8d256eb11813..1bc8d873a9e1 100644
--- a/fs/qnx4/inode.c
+++ b/fs/qnx4/inode.c
@@ -545,7 +545,7 @@ static int init_inodecache(void)
                                              sizeof(struct qnx4_inode_info),
                                              0, (SLAB_RECLAIM_ACCOUNT|
                                                 SLAB_MEM_SPREAD),
-                                             init_once, NULL);
+                                             init_once);
         if (qnx4_inode_cachep == NULL)
                 return -ENOMEM;
         return 0;
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 5a93cfe1a032..5b68dd3f191a 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -527,7 +527,7 @@ static int init_inodecache(void)
                                                          reiserfs_inode_info),
                                                   0, (SLAB_RECLAIM_ACCOUNT|
                                                         SLAB_MEM_SPREAD),
-                                                  init_once, NULL);
+                                                  init_once);
         if (reiserfs_inode_cachep == NULL)
                 return -ENOMEM;
         return 0;
diff --git a/fs/romfs/inode.c b/fs/romfs/inode.c
index 2284e03342c6..dae7945f90e4 100644
--- a/fs/romfs/inode.c
+++ b/fs/romfs/inode.c
@@ -572,14 +572,14 @@ static void init_once(void *foo, struct kmem_cache *cachep, unsigned long flags)
 
         inode_init_once(&ei->vfs_inode);
 }
- 
+
 static int init_inodecache(void)
 {
         romfs_inode_cachep = kmem_cache_create("romfs_inode_cache",
                                              sizeof(struct romfs_inode_info),
                                              0, (SLAB_RECLAIM_ACCOUNT|
                                                 SLAB_MEM_SPREAD),
-                                             init_once, NULL);
+                                             init_once);
         if (romfs_inode_cachep == NULL)
                 return -ENOMEM;
         return 0;
diff --git a/fs/smbfs/inode.c b/fs/smbfs/inode.c
index 6724a6cf01ff..73d1450a95d4 100644
--- a/fs/smbfs/inode.c
+++ b/fs/smbfs/inode.c
@@ -73,14 +73,14 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
 
         inode_init_once(&ei->vfs_inode);
 }
- 
+
 static int init_inodecache(void)
 {
         smb_inode_cachep = kmem_cache_create("smb_inode_cache",
                                              sizeof(struct smb_inode_info),
                                              0, (SLAB_RECLAIM_ACCOUNT|
                                                 SLAB_MEM_SPREAD),
-                                             init_once, NULL);
+                                             init_once);
         if (smb_inode_cachep == NULL)
                 return -ENOMEM;
         return 0;
diff --git a/fs/smbfs/request.c b/fs/smbfs/request.c
index 3f54a0f80fae..ca4b2d59c0ca 100644
--- a/fs/smbfs/request.c
+++ b/fs/smbfs/request.c
@@ -40,7 +40,7 @@ int smb_init_request_cache(void)
         req_cachep = kmem_cache_create("smb_request",
                                        sizeof(struct smb_request), 0,
                                        SMB_SLAB_DEBUG | SLAB_HWCACHE_ALIGN,
-                                       NULL, NULL);
+                                       NULL);
         if (req_cachep == NULL)
                 return -ENOMEM;
 
diff --git a/fs/sysfs/mount.c b/fs/sysfs/mount.c
index 60714d075c2f..fbc7b65fe262 100644
--- a/fs/sysfs/mount.c
+++ b/fs/sysfs/mount.c
@@ -86,7 +86,7 @@ int __init sysfs_init(void)
 
         sysfs_dir_cachep = kmem_cache_create("sysfs_dir_cache",
                                               sizeof(struct sysfs_dirent),
-                                              0, 0, NULL, NULL);
+                                              0, 0, NULL);
         if (!sysfs_dir_cachep)
                 goto out;
 
diff --git a/fs/sysv/inode.c b/fs/sysv/inode.c
index 564411693394..7c4e5d302abb 100644
--- a/fs/sysv/inode.c
+++ b/fs/sysv/inode.c
@@ -342,7 +342,7 @@ int __init sysv_init_icache(void)
         sysv_inode_cachep = kmem_cache_create("sysv_inode_cache",
                         sizeof(struct sysv_inode_info), 0,
                         SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
-                        init_once, NULL);
+                        init_once);
         if (!sysv_inode_cachep)
                 return -ENOMEM;
         return 0;
diff --git a/fs/udf/super.c b/fs/udf/super.c
index 911387aa1810..72097ee6b752 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -149,7 +149,7 @@ static int init_inodecache(void)
                                              sizeof(struct udf_inode_info),
                                              0, (SLAB_RECLAIM_ACCOUNT |
                                                  SLAB_MEM_SPREAD),
-                                             init_once, NULL);
+                                             init_once);
         if (udf_inode_cachep == NULL)
                 return -ENOMEM;
         return 0;
diff --git a/fs/ufs/super.c b/fs/ufs/super.c
index 2b3011689e89..73402c5eeb8a 100644
--- a/fs/ufs/super.c
+++ b/fs/ufs/super.c
@@ -1240,14 +1240,14 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag
 
         inode_init_once(&ei->vfs_inode);
 }
- 
+
 static int init_inodecache(void)
 {
         ufs_inode_cachep = kmem_cache_create("ufs_inode_cache",
                                              sizeof(struct ufs_inode_info),
                                              0, (SLAB_RECLAIM_ACCOUNT|
                                                 SLAB_MEM_SPREAD),
-                                             init_once, NULL);
+                                             init_once);
         if (ufs_inode_cachep == NULL)
                 return -ENOMEM;
         return 0;
diff --git a/fs/xfs/linux-2.6/kmem.h b/fs/xfs/linux-2.6/kmem.h
index 4b6470cf87f0..b4acc7f3c374 100644
--- a/fs/xfs/linux-2.6/kmem.h
+++ b/fs/xfs/linux-2.6/kmem.h
@@ -74,14 +74,14 @@ extern void  kmem_free(void *, size_t);
 static inline kmem_zone_t *
 kmem_zone_init(int size, char *zone_name)
 {
-        return kmem_cache_create(zone_name, size, 0, 0, NULL, NULL);
+        return kmem_cache_create(zone_name, size, 0, 0, NULL);
 }
 
 static inline kmem_zone_t *
 kmem_zone_init_flags(int size, char *zone_name, unsigned long flags,
                      void (*construct)(void *, kmem_zone_t *, unsigned long))
 {
-        return kmem_cache_create(zone_name, size, 0, flags, construct, NULL);
+        return kmem_cache_create(zone_name, size, 0, flags, construct);
 }
 
 static inline void