Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linvill...

[~andy/linux] / fs / adfs / super.c

diff --git a/fs/adfs/super.c b/fs/adfs/super.c
index de2ed5ca335192f44e813b52e2b840b0c94c2a1f..b36695ae5c2e9ff97b06ae999f0f1baaf01dd333 100644 (file)
--- a/fs/adfs/super.c
+++ b/fs/adfs/super.c
@@ -228,20 +228,20 @@ static void adfs_destroy_inode(struct inode *inode)
        kmem_cache_free(adfs_inode_cachep, ADFS_I(inode));
 }
 
-static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flags)
+static void init_once(struct kmem_cache *cachep, void *foo)
 {
        struct adfs_inode_info *ei = (struct adfs_inode_info *) foo;
 
        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;