Merge branch 'kmem_death' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

* 'kmem_death' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
  mm: Remove slab destructors from kmem_cache_create().

165 files changed, 247 insertions, 268 deletions

diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c
index 08d80f2f51f2..6d048490c559 100644
--- a/arch/arm/plat-s3c24xx/dma.c
+++ b/arch/arm/plat-s3c24xx/dma.c
@@ -1333,7 +1333,7 @@ int __init s3c24xx_dma_init(unsigned int channels, unsigned int irq,
         dma_kmem = kmem_cache_create("dma_desc",
                                      sizeof(struct s3c2410_dma_buf), 0,
                                      SLAB_HWCACHE_ALIGN,
-                                     s3c2410_dma_cache_ctor, NULL);
+                                     s3c2410_dma_cache_ctor);
 
         if (dma_kmem == NULL) {
                 printk(KERN_ERR "dma failed to make kmem cache\n");
diff --git a/arch/arm26/mm/memc.c b/arch/arm26/mm/memc.c
index 42505541a9b1..ffecd8578247 100644
--- a/arch/arm26/mm/memc.c
+++ b/arch/arm26/mm/memc.c
@@ -176,9 +176,9 @@ void __init pgtable_cache_init(void)
 {
         pte_cache = kmem_cache_create("pte-cache",
                                 sizeof(pte_t) * PTRS_PER_PTE,
-                                0, SLAB_PANIC, pte_cache_ctor, NULL);
+                                0, SLAB_PANIC, pte_cache_ctor);
 
         pgd_cache = kmem_cache_create("pgd-cache", MEMC_TABLE_SIZE +
                                 sizeof(pgd_t) * PTRS_PER_PGD,
-                                0, SLAB_PANIC, pgd_cache_ctor, NULL);
+                                0, SLAB_PANIC, pgd_cache_ctor);
 }
diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c
index 6a68b1ae061c..6e72f22e6bbd 100644
--- a/arch/i386/mm/init.c
+++ b/arch/i386/mm/init.c
@@ -752,8 +752,7 @@ void __init pgtable_cache_init(void)
                                         PTRS_PER_PMD*sizeof(pmd_t),
                                         PTRS_PER_PMD*sizeof(pmd_t),
                                         SLAB_PANIC,
-                                        pmd_ctor,
-                                        NULL);
+                                        pmd_ctor);
                 if (!SHARED_KERNEL_PMD) {
                         /* If we're in PAE mode and have a non-shared
                            kernel pmd, then the pgd size must be a
diff --git a/arch/ia64/ia32/ia32_support.c b/arch/ia64/ia32/ia32_support.c
index beea7a0b9dc6..e13a1a1db4b5 100644
--- a/arch/ia64/ia32/ia32_support.c
+++ b/arch/ia64/ia32/ia32_support.c
@@ -253,7 +253,7 @@ ia32_init (void)
 
                 partial_page_cachep = kmem_cache_create("partial_page_cache",
                                                 sizeof(struct partial_page),
-                                                0, SLAB_PANIC, NULL, NULL);
+                                                0, SLAB_PANIC, NULL);
         }
 #endif
         return 0;
diff --git a/arch/powerpc/kernel/rtas_flash.c b/arch/powerpc/kernel/rtas_flash.c
index f72118c0844f..62b7bf2f3eab 100644
--- a/arch/powerpc/kernel/rtas_flash.c
+++ b/arch/powerpc/kernel/rtas_flash.c
@@ -804,7 +804,7 @@ int __init rtas_flash_init(void)
 
         flash_block_cache = kmem_cache_create("rtas_flash_cache",
                                 RTAS_BLK_SIZE, RTAS_BLK_SIZE, 0,
-                                rtas_block_ctor, NULL);
+                                rtas_block_ctor);
         if (!flash_block_cache) {
                 printk(KERN_ERR "%s: failed to create block cache\n",
                                 __FUNCTION__);
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index 92a1b16fb7e3..4835f73af304 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -542,7 +542,7 @@ static int __init hugetlbpage_init(void)
                                                HUGEPTE_TABLE_SIZE,
                                                HUGEPTE_TABLE_SIZE,
                                                0,
-                                               zero_ctor, NULL);
+                                               zero_ctor);
         if (! huge_pgtable_cache)
                 panic("hugetlbpage_init(): could not create hugepte cache\n");
 
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c
index 1d6edf724c85..9f27bb56a61d 100644
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
@@ -178,7 +178,6 @@ void pgtable_cache_init(void)
                 pgtable_cache[i] = kmem_cache_create(name,
                                                      size, size,
                                                      SLAB_PANIC,
-                                                     zero_ctor,
-                                                     NULL);
+                                                     zero_ctor);
         }
 }
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index f37460e5bfd2..7eb4d6cbcb74 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -654,7 +654,7 @@ static int __init spufs_init(void)
         ret = -ENOMEM;
         spufs_inode_cache = kmem_cache_create("spufs_inode_cache",
                         sizeof(struct spufs_inode_info), 0,
-                        SLAB_HWCACHE_ALIGN, spufs_init_once, NULL);
+                        SLAB_HWCACHE_ALIGN, spufs_init_once);
 
         if (!spufs_inode_cache)
                 goto out;
diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c
index d7fff752e569..b98d6c3e6f36 100644
--- a/arch/sh/kernel/cpu/sh4/sq.c
+++ b/arch/sh/kernel/cpu/sh4/sq.c
@@ -371,8 +371,7 @@ static int __init sq_api_init(void)
         printk(KERN_NOTICE "sq: Registering store queue API.\n");
 
         sq_cache = kmem_cache_create("store_queue_cache",
-                                sizeof(struct sq_mapping), 0, 0,
-                                NULL, NULL);
+                                sizeof(struct sq_mapping), 0, 0, NULL);
         if (unlikely(!sq_cache))
                 return ret;
 
diff --git a/arch/sh/mm/pmb.c b/arch/sh/mm/pmb.c
index b6a5a338145b..a08a4a958add 100644
--- a/arch/sh/mm/pmb.c
+++ b/arch/sh/mm/pmb.c
@@ -310,7 +310,7 @@ static int __init pmb_init(void)
         BUG_ON(unlikely(nr_entries >= NR_PMB_ENTRIES));
 
         pmb_cache = kmem_cache_create("pmb", sizeof(struct pmb_entry), 0,
-                                      SLAB_PANIC, pmb_cache_ctor, NULL);
+                                      SLAB_PANIC, pmb_cache_ctor);
 
         jump_to_P2();
 
diff --git a/arch/sparc64/mm/tsb.c b/arch/sparc64/mm/tsb.c
index 8eb8a7c76ec9..7ff0a02f5813 100644
--- a/arch/sparc64/mm/tsb.c
+++ b/arch/sparc64/mm/tsb.c
@@ -262,8 +262,7 @@ void __init pgtable_cache_init(void)
 
                 tsb_caches[i] = kmem_cache_create(name,
                                                   size, size,
-                                                  0,
-                                                  NULL, NULL);
+                                                  0, NULL);
                 if (!tsb_caches[i]) {
                         prom_printf("Could not create %s cache\n", name);
                         prom_halt();
diff --git a/block/bsg.c b/block/bsg.c
index baa04e7adf19..f2992e72b841 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -1043,7 +1043,7 @@ static int __init bsg_init(void)
         dev_t devid;
 
         bsg_cmd_cachep = kmem_cache_create("bsg_cmd",
-                                sizeof(struct bsg_command), 0, 0, NULL, NULL);
+                                sizeof(struct bsg_command), 0, 0, NULL);
         if (!bsg_cmd_cachep) {
                 printk(KERN_ERR "bsg: failed creating slab cache\n");
                 return -ENOMEM;
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index d7cadf304168..66056ca5e631 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -3698,13 +3698,13 @@ int __init blk_dev_init(void)
                 panic("Failed to create kblockd\n");
 
         request_cachep = kmem_cache_create("blkdev_requests",
-                        sizeof(struct request), 0, SLAB_PANIC, NULL, NULL);
+                        sizeof(struct request), 0, SLAB_PANIC, NULL);
 
         requestq_cachep = kmem_cache_create("blkdev_queue",
-                        sizeof(request_queue_t), 0, SLAB_PANIC, NULL, NULL);
+                        sizeof(request_queue_t), 0, SLAB_PANIC, NULL);
 
         iocontext_cachep = kmem_cache_create("blkdev_ioc",
-                        sizeof(struct io_context), 0, SLAB_PANIC, NULL, NULL);
+                        sizeof(struct io_context), 0, SLAB_PANIC, NULL);
 
         for_each_possible_cpu(i)
                 INIT_LIST_HEAD(&per_cpu(blk_cpu_done, i));
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 2e7ba615d760..00d53c2fd1e8 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -1098,7 +1098,7 @@ void acpi_os_release_lock(acpi_spinlock lockp, acpi_cpu_flags flags)
 acpi_status
 acpi_os_create_cache(char *name, u16 size, u16 depth, acpi_cache_t ** cache)
 {
-        *cache = kmem_cache_create(name, size, 0, 0, NULL, NULL);
+        *cache = kmem_cache_create(name, size, 0, 0, NULL);
         if (*cache == NULL)
                 return AE_ERROR;
         else
diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index 478489c568a4..4f598270fa31 100644
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -257,9 +257,9 @@ aoeblk_exit(void)
 int __init
 aoeblk_init(void)
 {
-        buf_pool_cache = kmem_cache_create("aoe_bufs", 
+        buf_pool_cache = kmem_cache_create("aoe_bufs",
                                            sizeof(struct buf),
-                                           0, 0, NULL, NULL);
+                                           0, 0, NULL);
         if (buf_pool_cache == NULL)
                 return -ENOMEM;
 
diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c
index 93362eed94ed..3a9d7e2d4de6 100644
--- a/drivers/ieee1394/eth1394.c
+++ b/drivers/ieee1394/eth1394.c
@@ -1729,7 +1729,7 @@ static int __init ether1394_init_module(void)
 
         packet_task_cache = kmem_cache_create("packet_task",
                                               sizeof(struct packet_task),
-                                              0, 0, NULL, NULL);
+                                              0, 0, NULL);
         if (!packet_task_cache)
                 return -ENOMEM;
 
diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index 6b8faca02f8a..bc547f1d34ba 100644
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -2998,7 +2998,6 @@ static int __init ib_mad_init_module(void)
                                          sizeof(struct ib_mad_private),
                                          0,
                                          SLAB_HWCACHE_ALIGN,
-                                         NULL,
                                          NULL);
         if (!ib_mad_cache) {
                 printk(KERN_ERR PFX "Couldn't create ib_mad cache\n");
diff --git a/drivers/infiniband/hw/amso1100/c2_vq.c b/drivers/infiniband/hw/amso1100/c2_vq.c
index 36620a22413c..cfdacb1ec279 100644
--- a/drivers/infiniband/hw/amso1100/c2_vq.c
+++ b/drivers/infiniband/hw/amso1100/c2_vq.c
@@ -85,7 +85,7 @@ int vq_init(struct c2_dev *c2dev)
                 (char) ('0' + c2dev->devnum));
         c2dev->host_msg_cache =
             kmem_cache_create(c2dev->vq_cache_name, c2dev->rep_vq.msg_size, 0,
-                              SLAB_HWCACHE_ALIGN, NULL, NULL);
+                              SLAB_HWCACHE_ALIGN, NULL);
         if (c2dev->host_msg_cache == NULL) {
                 return -ENOMEM;
         }
diff --git a/drivers/infiniband/hw/ehca/ehca_av.c b/drivers/infiniband/hw/ehca/ehca_av.c
index e53a97af1260..97d108634c58 100644
--- a/drivers/infiniband/hw/ehca/ehca_av.c
+++ b/drivers/infiniband/hw/ehca/ehca_av.c
@@ -259,7 +259,7 @@ int ehca_init_av_cache(void)
         av_cache = kmem_cache_create("ehca_cache_av",
                                    sizeof(struct ehca_av), 0,
                                    SLAB_HWCACHE_ALIGN,
-                                   NULL, NULL);
+                                   NULL);
         if (!av_cache)
                 return -ENOMEM;
         return 0;
diff --git a/drivers/infiniband/hw/ehca/ehca_cq.c b/drivers/infiniband/hw/ehca/ehca_cq.c
index 9e87883b561a..1e8ca3fca4aa 100644
--- a/drivers/infiniband/hw/ehca/ehca_cq.c
+++ b/drivers/infiniband/hw/ehca/ehca_cq.c
@@ -387,7 +387,7 @@ int ehca_init_cq_cache(void)
         cq_cache = kmem_cache_create("ehca_cache_cq",
                                      sizeof(struct ehca_cq), 0,
                                      SLAB_HWCACHE_ALIGN,
-                                     NULL, NULL);
+                                     NULL);
         if (!cq_cache)
                 return -ENOMEM;
         return 0;
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
index 36377c6db3d4..04c324330b7c 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -163,7 +163,7 @@ static int ehca_create_slab_caches(void)
         ctblk_cache = kmem_cache_create("ehca_cache_ctblk",
                                         EHCA_PAGESIZE, H_CB_ALIGNMENT,
                                         SLAB_HWCACHE_ALIGN,
-                                        NULL, NULL);
+                                        NULL);
         if (!ctblk_cache) {
                 ehca_gen_err("Cannot create ctblk SLAB cache.");
                 ehca_cleanup_mrmw_cache();
diff --git a/drivers/infiniband/hw/ehca/ehca_mrmw.c b/drivers/infiniband/hw/ehca/ehca_mrmw.c
index 6262c5462d50..9f4c9d46e8ef 100644
--- a/drivers/infiniband/hw/ehca/ehca_mrmw.c
+++ b/drivers/infiniband/hw/ehca/ehca_mrmw.c
@@ -1950,13 +1950,13 @@ int ehca_init_mrmw_cache(void)
         mr_cache = kmem_cache_create("ehca_cache_mr",
                                      sizeof(struct ehca_mr), 0,
                                      SLAB_HWCACHE_ALIGN,
-                                     NULL, NULL);
+                                     NULL);
         if (!mr_cache)
                 return -ENOMEM;
         mw_cache = kmem_cache_create("ehca_cache_mw",
                                      sizeof(struct ehca_mw), 0,
                                      SLAB_HWCACHE_ALIGN,
-                                     NULL, NULL);
+                                     NULL);
         if (!mw_cache) {
                 kmem_cache_destroy(mr_cache);
                 mr_cache = NULL;
diff --git a/drivers/infiniband/hw/ehca/ehca_pd.c b/drivers/infiniband/hw/ehca/ehca_pd.c
index 79d0591a8043..c85312ad292b 100644
--- a/drivers/infiniband/hw/ehca/ehca_pd.c
+++ b/drivers/infiniband/hw/ehca/ehca_pd.c
@@ -100,7 +100,7 @@ int ehca_init_pd_cache(void)
         pd_cache = kmem_cache_create("ehca_cache_pd",
                                      sizeof(struct ehca_pd), 0,
                                      SLAB_HWCACHE_ALIGN,
-                                     NULL, NULL);
+                                     NULL);
         if (!pd_cache)
                 return -ENOMEM;
         return 0;
diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c
index 48e9ceacd6fa..a3146e696c5d 100644
--- a/drivers/infiniband/hw/ehca/ehca_qp.c
+++ b/drivers/infiniband/hw/ehca/ehca_qp.c
@@ -1760,7 +1760,7 @@ int ehca_init_qp_cache(void)
         qp_cache = kmem_cache_create("ehca_cache_qp",
                                      sizeof(struct ehca_qp), 0,
                                      SLAB_HWCACHE_ALIGN,
-                                     NULL, NULL);
+                                     NULL);
         if (!qp_cache)
                 return -ENOMEM;
         return 0;
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c
index effdee299b0c..5db314380271 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.c
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.c
@@ -637,7 +637,7 @@ static int __init iser_init(void)
         ig.desc_cache = kmem_cache_create("iser_descriptors",
                                           sizeof (struct iser_desc),
                                           0, SLAB_HWCACHE_ALIGN,
-                                          NULL, NULL);
+                                          NULL);
         if (ig.desc_cache == NULL)
                 return -ENOMEM;
 
diff --git a/drivers/kvm/mmu.c b/drivers/kvm/mmu.c
index b297a6b111ac..1199d3f32ac3 100644
--- a/drivers/kvm/mmu.c
+++ b/drivers/kvm/mmu.c
@@ -1332,24 +1332,24 @@ int kvm_mmu_module_init(void)
 {
         pte_chain_cache = kmem_cache_create("kvm_pte_chain",
                                             sizeof(struct kvm_pte_chain),
-                                            0, 0, NULL, NULL);
+                                            0, 0, NULL);
         if (!pte_chain_cache)
                 goto nomem;
         rmap_desc_cache = kmem_cache_create("kvm_rmap_desc",
                                             sizeof(struct kvm_rmap_desc),
-                                            0, 0, NULL, NULL);
+                                            0, 0, NULL);
         if (!rmap_desc_cache)
                 goto nomem;
 
         mmu_page_cache = kmem_cache_create("kvm_mmu_page",
                                            PAGE_SIZE,
-                                           PAGE_SIZE, 0, NULL, NULL);
+                                           PAGE_SIZE, 0, NULL);
         if (!mmu_page_cache)
                 goto nomem;
 
         mmu_page_header_cache = kmem_cache_create("kvm_mmu_page_header",
                                                   sizeof(struct kvm_mmu_page),
-                                                  0, 0, NULL, NULL);
+                                                  0, 0, NULL);
         if (!mmu_page_header_cache)
                 goto nomem;
 
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 0b66afef2d82..c8dfdb302916 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -951,7 +951,7 @@ static int grow_stripes(raid5_conf_t *conf, int num)
         conf->active_name = 0;
         sc = kmem_cache_create(conf->cache_name[conf->active_name],
                                sizeof(struct stripe_head)+(devs-1)*sizeof(struct r5dev),
-                               0, 0, NULL, NULL);
+                               0, 0, NULL);
         if (!sc)
                 return 1;
         conf->slab_cache = sc;
@@ -1003,7 +1003,7 @@ static int resize_stripes(raid5_conf_t *conf, int newsize)
         /* Step 1 */
         sc = kmem_cache_create(conf->cache_name[1-conf->active_name],
                                sizeof(struct stripe_head)+(newsize-1)*sizeof(struct r5dev),
-                               0, 0, NULL, NULL);
+                               0, 0, NULL);
         if (!sc)
                 return -ENOMEM;
 
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c
index 64a52bd7544a..988c8ce47f58 100644
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
@@ -1171,8 +1171,7 @@ static int __init i2o_block_init(void)
         /* Allocate request mempool and slab */
         size = sizeof(struct i2o_block_request);
         i2o_blk_req_pool.slab = kmem_cache_create("i2o_block_req", size, 0,
-                                                  SLAB_HWCACHE_ALIGN, NULL,
-                                                  NULL);
+                                                  SLAB_HWCACHE_ALIGN, NULL);
         if (!i2o_blk_req_pool.slab) {
                 osm_err("can't init request slab\n");
                 rc = -ENOMEM;
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index 8aff9385613f..7c5e29eaf118 100644
--- a/drivers/mtd/ubi/eba.c
+++ b/drivers/mtd/ubi/eba.c
@@ -1149,7 +1149,7 @@ int ubi_eba_init_scan(struct ubi_device *ubi, struct ubi_scan_info *si)
         if (ubi_devices_cnt == 0) {
                 ltree_slab = kmem_cache_create("ubi_ltree_slab",
                                                sizeof(struct ltree_entry), 0,
-                                               0, &ltree_entry_ctor, NULL);
+                                               0, &ltree_entry_ctor);
                 if (!ltree_slab)
                         return -ENOMEM;
         }
diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
index 9de953762097..a5a9b8d87302 100644
--- a/drivers/mtd/ubi/wl.c
+++ b/drivers/mtd/ubi/wl.c
@@ -1452,7 +1452,7 @@ int ubi_wl_init_scan(struct ubi_device *ubi, struct ubi_scan_info *si)
         if (ubi_devices_cnt == 0) {
                 wl_entries_slab = kmem_cache_create("ubi_wl_entry_slab",
                                                     sizeof(struct ubi_wl_entry),
-                                                    0, 0, NULL, NULL);
+                                                    0, 0, NULL);
                 if (!wl_entries_slab)
                         return -ENOMEM;
         }
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index 6a89cefe99bb..0c67258fb9ec 100644
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -291,7 +291,7 @@ dasd_parse_keyword( char *parsestring ) {
                 dasd_page_cache =
                         kmem_cache_create("dasd_page_cache", PAGE_SIZE,
                                           PAGE_SIZE, SLAB_CACHE_DMA,
-                                          NULL, NULL );
+                                          NULL);
                 if (!dasd_page_cache)
                         MESSAGE(KERN_WARNING, "%s", "Failed to create slab, "
                                 "fixed buffer mode disabled.");
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index a1db95925138..9726261c367d 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -259,21 +259,21 @@ zfcp_module_init(void)
         size = sizeof(struct zfcp_fsf_req_qtcb);
         align = calc_alignment(size);
         zfcp_data.fsf_req_qtcb_cache =
-                kmem_cache_create("zfcp_fsf", size, align, 0, NULL, NULL);
+                kmem_cache_create("zfcp_fsf", size, align, 0, NULL);
         if (!zfcp_data.fsf_req_qtcb_cache)
                 goto out;
 
         size = sizeof(struct fsf_status_read_buffer);
         align = calc_alignment(size);
         zfcp_data.sr_buffer_cache =
-                kmem_cache_create("zfcp_sr", size, align, 0, NULL, NULL);
+                kmem_cache_create("zfcp_sr", size, align, 0, NULL);
         if (!zfcp_data.sr_buffer_cache)
                 goto out_sr_cache;
 
         size = sizeof(struct zfcp_gid_pn_data);
         align = calc_alignment(size);
         zfcp_data.gid_pn_cache =
-                kmem_cache_create("zfcp_gid", size, align, 0, NULL, NULL);
+                kmem_cache_create("zfcp_gid", size, align, 0, NULL);
         if (!zfcp_data.gid_pn_cache)
                 goto out_gid_cache;
 
diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
index 1c0d7578e791..b8c6810090d5 100644
--- a/drivers/scsi/aic94xx/aic94xx_init.c
+++ b/drivers/scsi/aic94xx/aic94xx_init.c
@@ -462,7 +462,7 @@ static int asd_create_global_caches(void)
                                             sizeof(struct asd_dma_tok),
                                             0,
                                             SLAB_HWCACHE_ALIGN,
-                                            NULL, NULL);
+                                            NULL);
                 if (!asd_dma_token_cache) {
                         asd_printk("couldn't create dma token cache\n");
                         return -ENOMEM;
@@ -474,7 +474,7 @@ static int asd_create_global_caches(void)
                                                    sizeof(struct asd_ascb),
                                                    0,
                                                    SLAB_HWCACHE_ALIGN,
-                                                   NULL, NULL);
+                                                   NULL);
                 if (!asd_ascb_cache) {
                         asd_printk("couldn't create ascb cache\n");
                         goto Err;
diff --git a/drivers/scsi/libsas/sas_init.c b/drivers/scsi/libsas/sas_init.c
index 965698c8b7bf..1396c83b0c9c 100644
--- a/drivers/scsi/libsas/sas_init.c
+++ b/drivers/scsi/libsas/sas_init.c
@@ -292,7 +292,7 @@ EXPORT_SYMBOL_GPL(sas_domain_release_transport);
 static int __init sas_class_init(void)
 {
         sas_task_cache = kmem_cache_create("sas_task", sizeof(struct sas_task),
-                                           0, SLAB_HWCACHE_ALIGN, NULL, NULL);
+                                           0, SLAB_HWCACHE_ALIGN, NULL);
         if (!sas_task_cache)
                 return -ENOMEM;
 
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index b5a77b0c0deb..92376f9dfdd5 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -2723,7 +2723,7 @@ qla2x00_module_init(void)
 
         /* Allocate cache for SRBs. */
         srb_cachep = kmem_cache_create("qla2xxx_srbs", sizeof(srb_t), 0,
-            SLAB_HWCACHE_ALIGN, NULL, NULL);
+            SLAB_HWCACHE_ALIGN, NULL);
         if (srb_cachep == NULL) {
                 printk(KERN_ERR
                     "qla2xxx: Unable to allocate SRB cache...Failing load!\n");
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index e69160a7bc60..b1d565c12c5b 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -1677,7 +1677,7 @@ static int __init qla4xxx_module_init(void)
 
         /* Allocate cache for SRBs. */
         srb_cachep = kmem_cache_create("qla4xxx_srbs", sizeof(struct srb), 0,
-                                       SLAB_HWCACHE_ALIGN, NULL, NULL);
+                                       SLAB_HWCACHE_ALIGN, NULL);
         if (srb_cachep == NULL) {
                 printk(KERN_ERR
                        "%s: Unable to allocate SRB cache..."
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index a691dda40d2c..a5de1a829a76 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -288,7 +288,7 @@ int scsi_setup_command_freelist(struct Scsi_Host *shost)
         if (!pool->users) {
                 pool->slab = kmem_cache_create(pool->name,
                                 sizeof(struct scsi_cmnd), 0,
-                                pool->slab_flags, NULL, NULL);
+                                pool->slab_flags, NULL);
                 if (!pool->slab)
                         goto fail;
         }
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 1f5a07bf2a75..da63c544919b 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1661,7 +1661,7 @@ int __init scsi_init_queue(void)
 
         scsi_io_context_cache = kmem_cache_create("scsi_io_context",
                                         sizeof(struct scsi_io_context),
-                                        0, 0, NULL, NULL);
+                                        0, 0, NULL);
         if (!scsi_io_context_cache) {
                 printk(KERN_ERR "SCSI: can't init scsi io context cache\n");
                 return -ENOMEM;
@@ -1672,7 +1672,7 @@ int __init scsi_init_queue(void)
                 int size = sgp->size * sizeof(struct scatterlist);
 
                 sgp->slab = kmem_cache_create(sgp->name, size, 0,
-                                SLAB_HWCACHE_ALIGN, NULL, NULL);
+                                SLAB_HWCACHE_ALIGN, NULL);
                 if (!sgp->slab) {
                         printk(KERN_ERR "SCSI: can't init sg slab %s\n",
                                         sgp->name);
diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
index 2570f48a69c7..371b69c110bc 100644
--- a/drivers/scsi/scsi_tgt_lib.c
+++ b/drivers/scsi/scsi_tgt_lib.c
@@ -585,7 +585,7 @@ static int __init scsi_tgt_init(void)
 
         scsi_tgt_cmd_cache = kmem_cache_create("scsi_tgt_cmd",
                                                sizeof(struct scsi_tgt_cmd),
-                                               0, 0, NULL, NULL);
+                                               0, 0, NULL);
         if (!scsi_tgt_cmd_cache)
                 return -ENOMEM;
 
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index 76c555a67dac..805e5fc5f5db 100644
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -933,7 +933,7 @@ static int __init uhci_hcd_init(void)
         }
 
         uhci_up_cachep = kmem_cache_create("uhci_urb_priv",
-                sizeof(struct urb_priv), 0, 0, NULL, NULL);
+                sizeof(struct urb_priv), 0, 0, NULL);
         if (!uhci_up_cachep)
                 goto up_failed;
 
diff --git a/drivers/usb/mon/mon_text.c b/drivers/usb/mon/mon_text.c
index 982b773d71e6..8f27a9e1c36b 100644
--- a/drivers/usb/mon/mon_text.c
+++ b/drivers/usb/mon/mon_text.c
@@ -340,7 +340,7 @@ static int mon_text_open(struct inode *inode, struct file *file)
         snprintf(rp->slab_name, SLAB_NAME_SZ, "mon_text_%p", rp);
         rp->e_slab = kmem_cache_create(rp->slab_name,
             sizeof(struct mon_event_text), sizeof(long), 0,
-            mon_text_ctor, NULL);
+            mon_text_ctor);
         if (rp->e_slab == NULL) {
                 rc = -ENOMEM;
                 goto err_slab;
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
diff --git a/include/linux/i2o.h b/include/linux/i2o.h
index 333a370a3bdc..9752307d16ba 100644
--- a/include/linux/i2o.h
+++ b/include/linux/i2o.h
@@ -946,8 +946,7 @@ static inline int i2o_pool_alloc(struct i2o_pool *pool, const char *name,
         strcpy(pool->name, name);
 
         pool->slab =
-            kmem_cache_create(pool->name, size, 0, SLAB_HWCACHE_ALIGN, NULL,
-                              NULL);
+            kmem_cache_create(pool->name, size, 0, SLAB_HWCACHE_ALIGN, NULL);
         if (!pool->slab)
                 goto free_name;
 
diff --git a/include/linux/slab.h b/include/linux/slab.h
index 0e1d0daef6a2..7d0ecc1659f0 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -51,7 +51,6 @@ int slab_is_available(void);
 
 struct kmem_cache *kmem_cache_create(const char *, size_t, size_t,
                         unsigned long,
-                        void (*)(void *, struct kmem_cache *, unsigned long),
                         void (*)(void *, struct kmem_cache *, unsigned long));
 void kmem_cache_destroy(struct kmem_cache *);
 int kmem_cache_shrink(struct kmem_cache *);
@@ -70,7 +69,7 @@ int kmem_ptr_validate(struct kmem_cache *cachep, const void *ptr);
  */
 #define KMEM_CACHE(__struct, __flags) kmem_cache_create(#__struct,\
                 sizeof(struct __struct), __alignof__(struct __struct),\
-                (__flags), NULL, NULL)
+                (__flags), NULL)
 
 /*
  * The largest kmalloc size supported by the slab allocators is
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index a242c83d89d6..145d5a0d299f 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -1253,7 +1253,7 @@ static int __init init_mqueue_fs(void)
 
         mqueue_inode_cachep = kmem_cache_create("mqueue_inode_cache",
                                 sizeof(struct mqueue_inode_info), 0,
-                                SLAB_HWCACHE_ALIGN, init_once, NULL);
+                                SLAB_HWCACHE_ALIGN, init_once);
         if (mqueue_inode_cachep == NULL)
                 return -ENOMEM;
 
diff --git a/kernel/fork.c b/kernel/fork.c
index 469838998220..7332e236d367 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -137,7 +137,7 @@ void __init fork_init(unsigned long mempages)
         /* create a slab on which task_structs can be allocated */
         task_struct_cachep =
                 kmem_cache_create("task_struct", sizeof(struct task_struct),
-                        ARCH_MIN_TASKALIGN, SLAB_PANIC, NULL, NULL);
+                        ARCH_MIN_TASKALIGN, SLAB_PANIC, NULL);
 #endif
 
         /*
@@ -1446,22 +1446,22 @@ void __init proc_caches_init(void)
         sighand_cachep = kmem_cache_create("sighand_cache",
                         sizeof(struct sighand_struct), 0,
                         SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_DESTROY_BY_RCU,
-                        sighand_ctor, NULL);
+                        sighand_ctor);
         signal_cachep = kmem_cache_create("signal_cache",
                         sizeof(struct signal_struct), 0,
-                        SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL);
-        files_cachep = kmem_cache_create("files_cache", 
+                        SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
+        files_cachep = kmem_cache_create("files_cache",
                         sizeof(struct files_struct), 0,
-                        SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL);
-        fs_cachep = kmem_cache_create("fs_cache", 
+                        SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
+        fs_cachep = kmem_cache_create("fs_cache",
                         sizeof(struct fs_struct), 0,
-                        SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL);
+                        SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
         vm_area_cachep = kmem_cache_create("vm_area_struct",
                         sizeof(struct vm_area_struct), 0,
-                        SLAB_PANIC, NULL, NULL);
+                        SLAB_PANIC, NULL);
         mm_cachep = kmem_cache_create("mm_struct",
                         sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
-                        SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL);
+                        SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
 }
 
 /*
diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index 10f0bbba382b..a4fb7d46971f 100644
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -193,7 +193,7 @@ int unshare_nsproxy_namespaces(unsigned long unshare_flags,
 static int __init nsproxy_cache_init(void)
 {
         nsproxy_cachep = kmem_cache_create("nsproxy", sizeof(struct nsproxy),
-                                           0, SLAB_PANIC, NULL, NULL);
+                                           0, SLAB_PANIC, NULL);
         return 0;
 }
 
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
index 329ce0172074..55b3761edaa9 100644
--- a/kernel/posix-timers.c
+++ b/kernel/posix-timers.c
@@ -241,7 +241,7 @@ static __init int init_posix_timers(void)
         register_posix_clock(CLOCK_MONOTONIC, &clock_monotonic);
 
         posix_timers_cache = kmem_cache_create("posix_timers_cache",
-                                        sizeof (struct k_itimer), 0, 0, NULL, NULL);
+                                        sizeof (struct k_itimer), 0, 0, NULL);
         idr_init(&posix_timers_id);
         return 0;
 }
diff --git a/kernel/user.c b/kernel/user.c
index 98b82507797a..e7d11cef6998 100644
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -208,7 +208,7 @@ static int __init uid_cache_init(void)
         int n;
 
         uid_cachep = kmem_cache_create("uid_cache", sizeof(struct user_struct),
-                        0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL);
+                        0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
 
         for(n = 0; n < UIDHASH_SZ; ++n)
                 INIT_LIST_HEAD(init_user_ns.uidhash_table + n);
diff --git a/lib/idr.c b/lib/idr.c
index 5ca67b3cfd35..ffd61941e75d 100644
--- a/lib/idr.c
+++ b/lib/idr.c
@@ -590,7 +590,7 @@ static  int init_id_cache(void)
 {
         if (!idr_layer_cache)
                 idr_layer_cache = kmem_cache_create("idr_layer_cache",
-                        sizeof(struct idr_layer), 0, 0, idr_cache_ctor, NULL);
+                        sizeof(struct idr_layer), 0, 0, idr_cache_ctor);
         return 0;
 }
 
diff --git a/lib/radix-tree.c b/lib/radix-tree.c
index 9927cca14cb7..514efb200be6 100644
--- a/lib/radix-tree.c
+++ b/lib/radix-tree.c
@@ -1021,7 +1021,7 @@ void __init radix_tree_init(void)
 {
         radix_tree_node_cachep = kmem_cache_create("radix_tree_node",
                         sizeof(struct radix_tree_node), 0,
-                        SLAB_PANIC, radix_tree_node_ctor, NULL);
+                        SLAB_PANIC, radix_tree_node_ctor);
         radix_tree_init_maxindex();
         hotcpu_notifier(radix_tree_callback, 0);
 }
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 9f4e9b95e8f2..71b84b45154a 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -1605,11 +1605,11 @@ void __init numa_policy_init(void)
 
         policy_cache = kmem_cache_create("numa_policy",
                                          sizeof(struct mempolicy),
-                                         0, SLAB_PANIC, NULL, NULL);
+                                         0, SLAB_PANIC, NULL);
 
         sn_cache = kmem_cache_create("shared_policy_node",
                                      sizeof(struct sp_node),
-                                     0, SLAB_PANIC, NULL, NULL);
+                                     0, SLAB_PANIC, NULL);
 
         /*
          * Set interleaving policy for system init. Interleaving is only
diff --git a/mm/rmap.c b/mm/rmap.c
index fede5c7910be..41ac39749ef4 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -149,7 +149,7 @@ static void anon_vma_ctor(void *data, struct kmem_cache *cachep,
 void __init anon_vma_init(void)
 {
         anon_vma_cachep = kmem_cache_create("anon_vma", sizeof(struct anon_vma),
-                        0, SLAB_DESTROY_BY_RCU|SLAB_PANIC, anon_vma_ctor, NULL);
+                        0, SLAB_DESTROY_BY_RCU|SLAB_PANIC, anon_vma_ctor);
 }
 
 /*
diff --git a/mm/shmem.c b/mm/shmem.c
index ad155c7745dc..fcd19d323f9f 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2322,7 +2322,7 @@ static int init_inodecache(void)
 {
         shmem_inode_cachep = kmem_cache_create("shmem_inode_cache",
                                 sizeof(struct shmem_inode_info),
-                                0, 0, init_once, NULL);
+                                0, 0, init_once);
         if (shmem_inode_cachep == NULL)
                 return -ENOMEM;
         return 0;
diff --git a/mm/slab.c b/mm/slab.c
index c3feeaab3875..bde271c001ba 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -1484,7 +1484,7 @@ void __init kmem_cache_init(void)
                                         sizes[INDEX_AC].cs_size,
                                         ARCH_KMALLOC_MINALIGN,
                                         ARCH_KMALLOC_FLAGS|SLAB_PANIC,
-                                        NULL, NULL);
+                                        NULL);
 
         if (INDEX_AC != INDEX_L3) {
                 sizes[INDEX_L3].cs_cachep =
@@ -1492,7 +1492,7 @@ void __init kmem_cache_init(void)
                                 sizes[INDEX_L3].cs_size,
                                 ARCH_KMALLOC_MINALIGN,
                                 ARCH_KMALLOC_FLAGS|SLAB_PANIC,
-                                NULL, NULL);
+                                NULL);
         }
 
         slab_early_init = 0;
@@ -1510,7 +1510,7 @@ void __init kmem_cache_init(void)
                                         sizes->cs_size,
                                         ARCH_KMALLOC_MINALIGN,
                                         ARCH_KMALLOC_FLAGS|SLAB_PANIC,
-                                        NULL, NULL);
+                                        NULL);
                 }
 #ifdef CONFIG_ZONE_DMA
                 sizes->cs_dmacachep = kmem_cache_create(
@@ -1519,7 +1519,7 @@ void __init kmem_cache_init(void)
                                         ARCH_KMALLOC_MINALIGN,
                                         ARCH_KMALLOC_FLAGS|SLAB_CACHE_DMA|
                                                 SLAB_PANIC,
-                                        NULL, NULL);
+                                        NULL);
 #endif
                 sizes++;
                 names++;
@@ -2101,12 +2101,10 @@ static int __init_refok setup_cpu_cache(struct kmem_cache *cachep)
  * @align: The required alignment for the objects.
  * @flags: SLAB flags
  * @ctor: A constructor for the objects.
- * @dtor: A destructor for the objects (not implemented anymore).
  *
  * Returns a ptr to the cache on success, NULL on failure.
  * Cannot be called within a int, but can be interrupted.
- * The @ctor is run when new pages are allocated by the cache
- * and the @dtor is run before the pages are handed back.
+ * The @ctor is run when new pages are allocated by the cache.
  *
  * @name must be valid until the cache is destroyed. This implies that
  * the module calling this has to destroy the cache before getting unloaded.
@@ -2126,8 +2124,7 @@ static int __init_refok setup_cpu_cache(struct kmem_cache *cachep)
 struct kmem_cache *
 kmem_cache_create (const char *name, size_t size, size_t align,
         unsigned long flags,
-        void (*ctor)(void*, struct kmem_cache *, unsigned long),
-        void (*dtor)(void*, struct kmem_cache *, unsigned long))
+        void (*ctor)(void*, struct kmem_cache *, unsigned long))
 {
         size_t left_over, slab_size, ralign;
         struct kmem_cache *cachep = NULL, *pc;
@@ -2136,7 +2133,7 @@ kmem_cache_create (const char *name, size_t size, size_t align,
          * Sanity checks... these are all serious usage bugs.
          */
         if (!name || in_interrupt() || (size < BYTES_PER_WORD) ||
-            size > KMALLOC_MAX_SIZE || dtor) {
+            size > KMALLOC_MAX_SIZE) {
                 printk(KERN_ERR "%s: Early error in slab %s\n", __FUNCTION__,
                                 name);
                 BUG();
diff --git a/mm/slob.c b/mm/slob.c
index c89ef116d7aa..d50920ecc02b 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -492,8 +492,7 @@ struct kmem_cache {
 
 struct kmem_cache *kmem_cache_create(const char *name, size_t size,
         size_t align, unsigned long flags,
-        void (*ctor)(void*, struct kmem_cache *, unsigned long),
-        void (*dtor)(void*, struct kmem_cache *, unsigned long))
+        void (*ctor)(void*, struct kmem_cache *, unsigned long))
 {
         struct kmem_cache *c;
 
diff --git a/mm/slub.c b/mm/slub.c
index 322f3a5d72c7..9b2d6178d06c 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2668,12 +2668,10 @@ static struct kmem_cache *find_mergeable(size_t size,
 
 struct kmem_cache *kmem_cache_create(const char *name, size_t size,
                 size_t align, unsigned long flags,
-                void (*ctor)(void *, struct kmem_cache *, unsigned long),
-                void (*dtor)(void *, struct kmem_cache *, unsigned long))
+                void (*ctor)(void *, struct kmem_cache *, unsigned long))
 {
         struct kmem_cache *s;
 
-        BUG_ON(dtor);
         down_write(&slub_lock);
         s = find_mergeable(size, align, flags, ctor);
         if (s) {
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 3fc697293819..69b70977f000 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -36,7 +36,7 @@ int __init br_fdb_init(void)
         br_fdb_cache = kmem_cache_create("bridge_fdb_cache",
                                          sizeof(struct net_bridge_fdb_entry),
                                          0,
-                                         SLAB_HWCACHE_ALIGN, NULL, NULL);
+                                         SLAB_HWCACHE_ALIGN, NULL);
         if (!br_fdb_cache)
                 return -ENOMEM;
 
diff --git a/net/core/flow.c b/net/core/flow.c
index 051430545a05..0ab5234b17d8 100644
--- a/net/core/flow.c
+++ b/net/core/flow.c
@@ -350,7 +350,7 @@ static int __init flow_cache_init(void)
         flow_cachep = kmem_cache_create("flow_cache",
                                         sizeof(struct flow_cache_entry),
                                         0, SLAB_HWCACHE_ALIGN|SLAB_PANIC,
-                                        NULL, NULL);
+                                        NULL);
         flow_hash_shift = 10;
         flow_lwm = 2 * flow_hash_size;
         flow_hwm = 4 * flow_hash_size;
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 9df26a07f067..ca2a1533138a 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -1347,7 +1347,7 @@ void neigh_table_init_no_netlink(struct neigh_table *tbl)
                 tbl->kmem_cachep =
                         kmem_cache_create(tbl->id, tbl->entry_size, 0,
                                           SLAB_HWCACHE_ALIGN|SLAB_PANIC,
-                                          NULL, NULL);
+                                          NULL);
         tbl->stats = alloc_percpu(struct neigh_statistics);
         if (!tbl->stats)
                 panic("cannot create neighbour cache statistics");
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 0583e8498f13..35021eb3ed07 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -2021,13 +2021,13 @@ void __init skb_init(void)
                                               sizeof(struct sk_buff),
                                               0,
                                               SLAB_HWCACHE_ALIGN|SLAB_PANIC,
-                                              NULL, NULL);
+                                              NULL);
         skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
                                                 (2*sizeof(struct sk_buff)) +
                                                 sizeof(atomic_t),
                                                 0,
                                                 SLAB_HWCACHE_ALIGN|SLAB_PANIC,
-                                                NULL, NULL);
+                                                NULL);
 }
 
 /**
diff --git a/net/core/sock.c b/net/core/sock.c
index 239a08a6ff24..bd209c4477a9 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1767,7 +1767,7 @@ int proto_register(struct proto *prot, int alloc_slab)
 
         if (alloc_slab) {
                 prot->slab = kmem_cache_create(prot->name, prot->obj_size, 0,
-                                               SLAB_HWCACHE_ALIGN, NULL, NULL);
+                                               SLAB_HWCACHE_ALIGN, NULL);
 
                 if (prot->slab == NULL) {
                         printk(KERN_CRIT "%s: Can't create sock SLAB cache!\n",
@@ -1785,7 +1785,7 @@ int proto_register(struct proto *prot, int alloc_slab)
                         sprintf(request_sock_slab_name, mask, prot->name);
                         prot->rsk_prot->slab = kmem_cache_create(request_sock_slab_name,
                                                                  prot->rsk_prot->obj_size, 0,
-                                                                 SLAB_HWCACHE_ALIGN, NULL, NULL);
+                                                                 SLAB_HWCACHE_ALIGN, NULL);
 
                         if (prot->rsk_prot->slab == NULL) {
                                 printk(KERN_CRIT "%s: Can't create request sock SLAB cache!\n",
@@ -1807,7 +1807,7 @@ int proto_register(struct proto *prot, int alloc_slab)
                                 kmem_cache_create(timewait_sock_slab_name,
                                                   prot->twsk_prot->twsk_obj_size,
                                                   0, SLAB_HWCACHE_ALIGN,
-                                                  NULL, NULL);
+                                                  NULL);
                         if (prot->twsk_prot->twsk_slab == NULL)
                                 goto out_free_timewait_sock_slab_name;
                 }
diff --git a/net/dccp/ackvec.c b/net/dccp/ackvec.c
index 01030f346177..7ac775f9a64b 100644
--- a/net/dccp/ackvec.c
+++ b/net/dccp/ackvec.c
@@ -481,14 +481,14 @@ int __init dccp_ackvec_init(void)
 {
         dccp_ackvec_slab = kmem_cache_create("dccp_ackvec",
                                              sizeof(struct dccp_ackvec), 0,
-                                             SLAB_HWCACHE_ALIGN, NULL, NULL);
+                                             SLAB_HWCACHE_ALIGN, NULL);
         if (dccp_ackvec_slab == NULL)
                 goto out_err;
 
         dccp_ackvec_record_slab =
                         kmem_cache_create("dccp_ackvec_record",
                                           sizeof(struct dccp_ackvec_record),
-                                          0, SLAB_HWCACHE_ALIGN, NULL, NULL);
+                                          0, SLAB_HWCACHE_ALIGN, NULL);
         if (dccp_ackvec_record_slab == NULL)
                 goto out_destroy_slab;
 
diff --git a/net/dccp/ccid.c b/net/dccp/ccid.c
index d8cf92f09e68..ccbf72c793b6 100644
--- a/net/dccp/ccid.c
+++ b/net/dccp/ccid.c
@@ -69,7 +69,7 @@ static struct kmem_cache *ccid_kmem_cache_create(int obj_size, const char *fmt,.
         if (slab_name == NULL)
                 return NULL;
         slab = kmem_cache_create(slab_name, sizeof(struct ccid) + obj_size, 0,
-                                 SLAB_HWCACHE_ALIGN, NULL, NULL);
+                                 SLAB_HWCACHE_ALIGN, NULL);
         if (slab == NULL)
                 kfree(slab_name);
         return slab;
diff --git a/net/dccp/ccids/lib/loss_interval.c b/net/dccp/ccids/lib/loss_interval.c
index dd0fc992b042..174d3f13d93f 100644
--- a/net/dccp/ccids/lib/loss_interval.c
+++ b/net/dccp/ccids/lib/loss_interval.c
@@ -282,7 +282,7 @@ static __init int dccp_li_init(void)
 {
         dccp_li_cachep = kmem_cache_create("dccp_li_hist",
                                            sizeof(struct dccp_li_hist_entry),
-                                           0, SLAB_HWCACHE_ALIGN, NULL, NULL);
+                                           0, SLAB_HWCACHE_ALIGN, NULL);
         return dccp_li_cachep == NULL ? -ENOBUFS : 0;
 }
 
diff --git a/net/dccp/ccids/lib/packet_history.c b/net/dccp/ccids/lib/packet_history.c
index 2e8ef42721e2..34c4f6047724 100644
--- a/net/dccp/ccids/lib/packet_history.c
+++ b/net/dccp/ccids/lib/packet_history.c
@@ -59,7 +59,7 @@ struct dccp_tx_hist *dccp_tx_hist_new(const char *name)
         hist->dccptxh_slab = kmem_cache_create(slab_name,
                                              sizeof(struct dccp_tx_hist_entry),
                                                0, SLAB_HWCACHE_ALIGN,
-                                               NULL, NULL);
+                                               NULL);
         if (hist->dccptxh_slab == NULL)
                 goto out_free_slab_name;
 out:
@@ -148,7 +148,7 @@ struct dccp_rx_hist *dccp_rx_hist_new(const char *name)
         hist->dccprxh_slab = kmem_cache_create(slab_name,
                                              sizeof(struct dccp_rx_hist_entry),
                                                0, SLAB_HWCACHE_ALIGN,
-                                               NULL, NULL);
+                                               NULL);
         if (hist->dccprxh_slab == NULL)
                 goto out_free_slab_name;
 out:
diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index 6607b7b14f34..04b59ec4f512 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -1003,7 +1003,7 @@ static int __init dccp_init(void)
         dccp_hashinfo.bind_bucket_cachep =
                 kmem_cache_create("dccp_bind_bucket",
                                   sizeof(struct inet_bind_bucket), 0,
-                                  SLAB_HWCACHE_ALIGN, NULL, NULL);
+                                  SLAB_HWCACHE_ALIGN, NULL);
         if (!dccp_hashinfo.bind_bucket_cachep)
                 goto out;
 
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index 82622fb6f68f..f2a61ef2af9c 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -1770,7 +1770,7 @@ void __init dn_route_init(void)
 
         dn_dst_ops.kmem_cachep =
                 kmem_cache_create("dn_dst_cache", sizeof(struct dn_route), 0,
-                                  SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL);
+                                  SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
         init_timer(&dn_route_timer);
         dn_route_timer.function = dn_dst_check_expire;
         dn_route_timer.expires = jiffies + decnet_dst_gc_interval * HZ;
diff --git a/net/decnet/dn_table.c b/net/decnet/dn_table.c
index d6615c9361e9..fda0772fa215 100644
--- a/net/decnet/dn_table.c
+++ b/net/decnet/dn_table.c
@@ -881,7 +881,7 @@ void __init dn_fib_table_init(void)
         dn_hash_kmem = kmem_cache_create("dn_fib_info_cache",
                                         sizeof(struct dn_fib_info),
                                         0, SLAB_HWCACHE_ALIGN,
-                                        NULL, NULL);
+                                        NULL);
 }
 
 void __exit dn_fib_table_cleanup(void)
diff --git a/net/ipv4/fib_hash.c b/net/ipv4/fib_hash.c
index 07e843a47dde..9ad1d9ff9ce7 100644
--- a/net/ipv4/fib_hash.c
+++ b/net/ipv4/fib_hash.c
@@ -771,13 +771,13 @@ struct fib_table * __init fib_hash_init(u32 id)
                 fn_hash_kmem = kmem_cache_create("ip_fib_hash",
                                                  sizeof(struct fib_node),
                                                  0, SLAB_HWCACHE_ALIGN,
-                                                 NULL, NULL);
+                                                 NULL);
 
         if (fn_alias_kmem == NULL)
                 fn_alias_kmem = kmem_cache_create("ip_fib_alias",
                                                   sizeof(struct fib_alias),
                                                   0, SLAB_HWCACHE_ALIGN,
-                                                  NULL, NULL);
+                                                  NULL);
 
         tb = kmalloc(sizeof(struct fib_table) + sizeof(struct fn_hash),
                      GFP_KERNEL);
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 30e332ade61b..9ca786a6fd3c 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -1970,7 +1970,7 @@ struct fib_table * __init fib_hash_init(u32 id)
                 fn_alias_kmem = kmem_cache_create("ip_fib_alias",
                                                   sizeof(struct fib_alias),
                                                   0, SLAB_HWCACHE_ALIGN,
-                                                  NULL, NULL);
+                                                  NULL);
 
         tb = kmalloc(sizeof(struct fib_table) + sizeof(struct trie),
                      GFP_KERNEL);
diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
index 2f44e6128068..6cbce96a54ce 100644
--- a/net/ipv4/inetpeer.c
+++ b/net/ipv4/inetpeer.c
@@ -123,7 +123,7 @@ void __init inet_initpeers(void)
         peer_cachep = kmem_cache_create("inet_peer_cache",
                         sizeof(struct inet_peer),
                         0, SLAB_HWCACHE_ALIGN|SLAB_PANIC,
-                        NULL, NULL);
+                        NULL);
 
         /* All the timers, started at system startup tend
            to synchronize. Perturb it a bit.
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index d96582acdf69..7003cc1b7fe2 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -1917,7 +1917,7 @@ void __init ip_mr_init(void)
         mrt_cachep = kmem_cache_create("ip_mrt_cache",
                                        sizeof(struct mfc_cache),
                                        0, SLAB_HWCACHE_ALIGN|SLAB_PANIC,
-                                       NULL, NULL);
+                                       NULL);
         init_timer(&ipmr_expire_timer);
         ipmr_expire_timer.function=ipmr_expire_process;
         register_netdevice_notifier(&ip_mr_notifier);
diff --git a/net/ipv4/ipvs/ip_vs_conn.c b/net/ipv4/ipvs/ip_vs_conn.c
index 3b446b1a6b9c..d612a6a5d957 100644
--- a/net/ipv4/ipvs/ip_vs_conn.c
+++ b/net/ipv4/ipvs/ip_vs_conn.c
@@ -901,7 +901,7 @@ int ip_vs_conn_init(void)
         /* Allocate ip_vs_conn slab cache */
         ip_vs_conn_cachep = kmem_cache_create("ip_vs_conn",
                                               sizeof(struct ip_vs_conn), 0,
-                                              SLAB_HWCACHE_ALIGN, NULL, NULL);
+                                              SLAB_HWCACHE_ALIGN, NULL);
         if (!ip_vs_conn_cachep) {
                 vfree(ip_vs_conn_tab);
                 return -ENOMEM;
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 88fa648d7ba3..df42b7fb3268 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2967,7 +2967,7 @@ int __init ip_rt_init(void)
 
         ipv4_dst_ops.kmem_cachep =
                 kmem_cache_create("ip_dst_cache", sizeof(struct rtable), 0,
-                                  SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL);
+                                  SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
 
         ipv4_dst_blackhole_ops.kmem_cachep = ipv4_dst_ops.kmem_cachep;
 
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 987b94403be5..da4c0b6ab79a 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2430,7 +2430,7 @@ void __init tcp_init(void)
         tcp_hashinfo.bind_bucket_cachep =
                 kmem_cache_create("tcp_bind_bucket",
                                   sizeof(struct inet_bind_bucket), 0,
-                                  SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL);
+                                  SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
 
         /* Size and allocate the main established and bind bucket
          * hash tables.
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index 662a7d9681fd..6a612a701eaa 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -1474,7 +1474,7 @@ void __init fib6_init(void)
         fib6_node_kmem = kmem_cache_create("fib6_nodes",
                                            sizeof(struct fib6_node),
                                            0, SLAB_HWCACHE_ALIGN|SLAB_PANIC,
-                                           NULL, NULL);
+                                           NULL);
 
         fib6_tables_init();
 
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index fe8d9837f9f8..919de682b331 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2555,7 +2555,7 @@ void __init ip6_route_init(void)
 #endif
         ip6_dst_ops.kmem_cachep =
                 kmem_cache_create("ip6_dst_cache", sizeof(struct rt6_info), 0,
-                                  SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL);
+                                  SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
         ip6_dst_blackhole_ops.kmem_cachep = ip6_dst_ops.kmem_cachep;
 
         fib6_init();
diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c
index 6f87dd568ded..30f3236c402a 100644
--- a/net/ipv6/xfrm6_tunnel.c
+++ b/net/ipv6/xfrm6_tunnel.c
@@ -84,7 +84,7 @@ static int xfrm6_tunnel_spi_init(void)
         xfrm6_tunnel_spi_kmem = kmem_cache_create("xfrm6_tunnel_spi",
                                                   sizeof(struct xfrm6_tunnel_spi),
                                                   0, SLAB_HWCACHE_ALIGN,
-                                                  NULL, NULL);
+                                                  NULL);
         if (!xfrm6_tunnel_spi_kmem)
                 return -ENOMEM;
 
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 8cce814f6bee..aa086c83af80 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -1108,7 +1108,7 @@ int __init nf_conntrack_init(void)
 
         nf_conntrack_cachep = kmem_cache_create("nf_conntrack",
                                                 sizeof(struct nf_conn),
-                                                0, 0, NULL, NULL);
+                                                0, 0, NULL);
         if (!nf_conntrack_cachep) {
                 printk(KERN_ERR "Unable to create nf_conn slab cache\n");
                 goto err_free_hash;
diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c
index 2191fe008f60..1aa6229ca99f 100644
--- a/net/netfilter/nf_conntrack_expect.c
+++ b/net/netfilter/nf_conntrack_expect.c
@@ -540,7 +540,7 @@ int __init nf_conntrack_expect_init(void)
 
         nf_ct_expect_cachep = kmem_cache_create("nf_conntrack_expect",
                                         sizeof(struct nf_conntrack_expect),
-                                        0, 0, NULL, NULL);
+                                        0, 0, NULL);
         if (!nf_ct_expect_cachep)
                 goto err2;
 
diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
index d6b3d01975b6..bd45f9d3f7d0 100644
--- a/net/netfilter/xt_hashlimit.c
+++ b/net/netfilter/xt_hashlimit.c
@@ -738,7 +738,7 @@ static int __init xt_hashlimit_init(void)
         err = -ENOMEM;
         hashlimit_cachep = kmem_cache_create("xt_hashlimit",
                                             sizeof(struct dsthash_ent), 0, 0,
-                                            NULL, NULL);
+                                            NULL);
         if (!hashlimit_cachep) {
                 printk(KERN_ERR "xt_hashlimit: unable to create slab cache\n");
                 goto err2;
diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
index 46f6d572ad2d..16a68df4e36b 100644
--- a/net/rxrpc/af_rxrpc.c
+++ b/net/rxrpc/af_rxrpc.c
@@ -792,7 +792,7 @@ static int __init af_rxrpc_init(void)
         ret = -ENOMEM;
         rxrpc_call_jar = kmem_cache_create(
                 "rxrpc_call_jar", sizeof(struct rxrpc_call), 0,
-                SLAB_HWCACHE_ALIGN, NULL, NULL);
+                SLAB_HWCACHE_ALIGN, NULL);
         if (!rxrpc_call_jar) {
                 printk(KERN_NOTICE "RxRPC: Failed to allocate call jar\n");
                 goto error_call_jar;
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index 34bab36637ac..e98579b788b8 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -980,14 +980,14 @@ SCTP_STATIC __init int sctp_init(void)
         sctp_bucket_cachep = kmem_cache_create("sctp_bind_bucket",
                                                sizeof(struct sctp_bind_bucket),
                                                0, SLAB_HWCACHE_ALIGN,
-                                               NULL, NULL);
+                                               NULL);
         if (!sctp_bucket_cachep)
                 goto out;
 
         sctp_chunk_cachep = kmem_cache_create("sctp_chunk",
                                                sizeof(struct sctp_chunk),
                                                0, SLAB_HWCACHE_ALIGN,
-                                               NULL, NULL);
+                                               NULL);
         if (!sctp_chunk_cachep)
                 goto err_chunk_cachep;
 
diff --git a/net/socket.c b/net/socket.c
index b71114250046..ec077037f534 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -272,8 +272,7 @@ static int init_inodecache(void)
                                               (SLAB_HWCACHE_ALIGN |
                                                SLAB_RECLAIM_ACCOUNT |
                                                SLAB_MEM_SPREAD),
-                                              init_once,
-                                              NULL);
+                                              init_once);
         if (sock_inode_cachep == NULL)
                 return -ENOMEM;
         return 0;
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index 5b2b6fb244f2..650af064ff8d 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -867,7 +867,7 @@ int register_rpc_pipefs(void)
                                 sizeof(struct rpc_inode),
                                 0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
                                                 SLAB_MEM_SPREAD),
-                                init_once, NULL);
+                                init_once);
         if (!rpc_inode_cachep)
                 return -ENOMEM;
         err = register_filesystem(&rpc_pipe_fs_type);
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index 2ac43c41c3a9..b5723c262a3e 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -1031,13 +1031,13 @@ rpc_init_mempool(void)
         rpc_task_slabp = kmem_cache_create("rpc_tasks",
                                              sizeof(struct rpc_task),
                                              0, SLAB_HWCACHE_ALIGN,
-                                             NULL, NULL);
+                                             NULL);
         if (!rpc_task_slabp)
                 goto err_nomem;
         rpc_buffer_slabp = kmem_cache_create("rpc_buffers",
                                              RPC_BUFFER_MAXSIZE,
                                              0, SLAB_HWCACHE_ALIGN,
-                                             NULL, NULL);
+                                             NULL);
         if (!rpc_buffer_slabp)
                 goto err_nomem;
         rpc_task_mempool = mempool_create_slab_pool(RPC_TASK_POOLSIZE,
diff --git a/net/tipc/handler.c b/net/tipc/handler.c
index e1dcf663f8a6..0c70010a7dfe 100644
--- a/net/tipc/handler.c
+++ b/net/tipc/handler.c
@@ -97,7 +97,7 @@ int tipc_handler_start(void)
 {
         tipc_queue_item_cache =
                 kmem_cache_create("tipc_queue_items", sizeof(struct queue_item),
-                                  0, SLAB_HWCACHE_ALIGN, NULL, NULL);
+                                  0, SLAB_HWCACHE_ALIGN, NULL);
         if (!tipc_queue_item_cache)
                 return -ENOMEM;
 
diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c
index 5c4695840c58..113f44429982 100644
--- a/net/xfrm/xfrm_input.c
+++ b/net/xfrm/xfrm_input.c
@@ -83,5 +83,5 @@ void __init xfrm_input_init(void)
         secpath_cachep = kmem_cache_create("secpath_cache",
                                            sizeof(struct sec_path),
                                            0, SLAB_HWCACHE_ALIGN|SLAB_PANIC,
-                                           NULL, NULL);
+                                           NULL);
 }
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index cfaf17c8851e..c3a4b0a18687 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -2378,7 +2378,7 @@ static void __init xfrm_policy_init(void)
         xfrm_dst_cache = kmem_cache_create("xfrm_dst_cache",
                                            sizeof(struct xfrm_dst),
                                            0, SLAB_HWCACHE_ALIGN|SLAB_PANIC,
-                                           NULL, NULL);
+                                           NULL);
 
         hmask = 8 - 1;
         sz = (hmask+1) * sizeof(struct hlist_head);
diff --git a/security/keys/key.c b/security/keys/key.c
index 700400d801dc..01bbc6d9d19b 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -1001,7 +1001,7 @@ void __init key_init(void)
 {
         /* allocate a slab in which we can store keys */
         key_jar = kmem_cache_create("key_jar", sizeof(struct key),
-                        0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL);
+                        0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
 
         /* add the special key types */
         list_add_tail(&key_type_keyring.link, &key_types_list);
diff --git a/security/selinux/avc.c b/security/selinux/avc.c
index 78c408fd2b02..ecd067384531 100644
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
@@ -239,7 +239,7 @@ void __init avc_init(void)
         atomic_set(&avc_cache.lru_hint, 0);
 
         avc_node_cachep = kmem_cache_create("avc_node", sizeof(struct avc_node),
-                                             0, SLAB_PANIC, NULL, NULL);
+                                             0, SLAB_PANIC, NULL);
 
         audit_log(current->audit_context, GFP_KERNEL, AUDIT_KERNEL, "AVC INITIALIZED\n");
 }
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 26356e67108e..0fac6829c63a 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -4913,7 +4913,7 @@ static __init int selinux_init(void)
 
         sel_inode_cache = kmem_cache_create("selinux_inode_security",
                                             sizeof(struct inode_security_struct),
-                                            0, SLAB_PANIC, NULL, NULL);
+                                            0, SLAB_PANIC, NULL);
         avc_init();
 
         original_ops = secondary_ops = security_ops;
diff --git a/security/selinux/ss/avtab.c b/security/selinux/ss/avtab.c
index 3122908afdc1..85705eb289e0 100644
--- a/security/selinux/ss/avtab.c
+++ b/security/selinux/ss/avtab.c
@@ -445,7 +445,7 @@ void avtab_cache_init(void)
 {
         avtab_node_cachep = kmem_cache_create("avtab_node",
                                               sizeof(struct avtab_node),
-                                              0, SLAB_PANIC, NULL, NULL);
+                                              0, SLAB_PANIC, NULL);
 }
 
 void avtab_cache_destroy(void)