Unionfs: kmem_cache_create doesn't take a dtor argument any longer

Porting unionfs to 2.6.23-rc1

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>

diff --git a/fs/unionfs/lookup.c b/fs/unionfs/lookup.c
index 4e89a3c4b87b9d9476f0845072e1bac18b4320bb..2045a437d66d2af1cf1de47a91ee9e988eebed0a 100644 (file)
--- a/fs/unionfs/lookup.c
+++ b/fs/unionfs/lookup.c
@@ -467,7 +467,7 @@ int unionfs_init_dentry_cache(void)
        unionfs_dentry_cachep =
                kmem_cache_create("unionfs_dentry",
                                  sizeof(struct unionfs_dentry_info),
-                                 0, SLAB_RECLAIM_ACCOUNT, NULL, NULL);
+                                 0, SLAB_RECLAIM_ACCOUNT, NULL);
 
        return (unionfs_dentry_cachep ? 0 : -ENOMEM);
 }

diff --git a/fs/unionfs/rdstate.c b/fs/unionfs/rdstate.c
index 5c9d14bd0f4c7a67c2d4f1e012a841bc4ac38fa5..0a18d5c2673453575b2d6f9c07a61076b147785c 100644 (file)
--- a/fs/unionfs/rdstate.c
+++ b/fs/unionfs/rdstate.c
@@ -38,7 +38,7 @@ int unionfs_init_filldir_cache(void)
        unionfs_filldir_cachep =
                kmem_cache_create("unionfs_filldir",
                                  sizeof(struct filldir_node), 0,
-                                 SLAB_RECLAIM_ACCOUNT, NULL, NULL);
+                                 SLAB_RECLAIM_ACCOUNT, NULL);
 
        return (unionfs_filldir_cachep ? 0 : -ENOMEM);
 }

diff --git a/fs/unionfs/super.c b/fs/unionfs/super.c
index f4118dfa0a361127e797c36cf0bd84da75464d6f..d63b19f0dd55adf89b305b592e062366cfa1929b 100644 (file)
--- a/fs/unionfs/super.c
+++ b/fs/unionfs/super.c
@@ -868,7 +868,7 @@ int unionfs_init_inode_cache(void)
        unionfs_inode_cachep =
                kmem_cache_create("unionfs_inode_cache",
                                  sizeof(struct unionfs_inode_info), 0,
-                                 SLAB_RECLAIM_ACCOUNT, init_once, NULL);
+                                 SLAB_RECLAIM_ACCOUNT, init_once);
        if (!unionfs_inode_cachep)
                err = -ENOMEM;
        return err;