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 b4c489c50d39184582b737d30fca97946e637c10..36f6bc033abed29811d59303b4cbd6f0cfe31882 100644 (file)
--- a/fs/unionfs/lookup.c
+++ b/fs/unionfs/lookup.c
@@ -412,7 +412,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 290cb2c668f65e6a77dd39b8cb9d9e0e920189f7..c899844a42748104e5bea96ceb4863e42d804fd3 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 261390fdd7bf501bf64b0b5443c7f3cdecb28ee2..b523eae44427c0ca2302037b7e4d7a7bcfc77df8 100644 (file)
--- a/fs/unionfs/super.c
+++ b/fs/unionfs/super.c
@@ -899,7 +899,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;